diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py')
| -rwxr-xr-x | meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py index 877e3eb57..928e8bdef 100755 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Copied from phosphor-settings-manager Loads a "target" YAML file and overwrites its values with values from "override" YAML files. @@ -34,7 +34,7 @@ def dict_merge(target, source): """ if not isinstance(source, dict): return source - for k, v in source.iteritems(): + for k, v in source.items(): if k in target and isinstance(target[k], dict): dict_merge(target[k], v) else: |