sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-21 20:38:57 +00:00
Code Issues Releases Wiki Activity

fw/config: better error when merging augs

Browse Source 
If one or more entries for augmentations in configuration contains an
invalid value, raise ConfigError with the entry name.
This commit is contained in:
Sergei Trofimov 2018-03-22 12:19:47 +00:00 committed by Marc Bonnici
parent 3d7984412a
commit 72f2f82594
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wa/framework/configuration/parsers.py
View File

@ -221,7 +221,16 @@ def merge_augmentations(raw):
cfg_point = JobSpec.configuration['augmentations'] cfg_point = JobSpec.configuration['augmentations']
names = [cfg_point.name,] + cfg_point.aliases names = [cfg_point.name,] + cfg_point.aliases
entries = [toggle_set(raw.pop(n)) for n in names if n in raw] entries = []
for n in names:
if n not in raw:
continue
value = raw.pop(n)
try:
entries.append(toggle_set(value))
except TypeError as e:
msg = 'Invalid value "{}" for "{}": {}'
raise ConfigError(msg.format(value, n, e))
# Make sure none of the specified aliases conflict with each other # Make sure none of the specified aliases conflict with each other
to_check = [e for e in entries] to_check = [e for e in entries]