sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-19 04:21:17 +00:00
Code Issues Releases Wiki Activity

Misc Utils: Fixed 'merge_dicts_simple'

Browse Source 
Previously this function was ignoring the `other` parameter
and therefore not actually merging the two dictionaries.
This commit is contained in:
Marc Bonnici 2017-03-31 17:37:48 +01:00
parent fc45b94b4e
commit 519389859e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wa/utils/misc.py
View File

@ -575,7 +575,7 @@ def merge_maps(m1, m2):
def merge_dicts_simple(base, other): def merge_dicts_simple(base, other):
result = base.copy() result = base.copy()
for key, value in (base or {}).iteritems(): for key, value in (other or {}).iteritems():
result[key] = merge_config_values(result.get(key), value) result[key] = merge_config_values(result.get(key), value)
return result return result