diff options
| author | Andrew Geissler <openbmcbump-github@yahoo.com> | 2020-03-30 17:31:19 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-01 16:35:54 +0300 |
| commit | 04b85e9f7cb38c97af7b30d45f912c48183f06e0 (patch) | |
| tree | 2ec5ff34eb20cebd1cf4565799cfb74cb8ed319e /meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py | |
| parent | cb8ef5c36612f9c2eb0451de04f813372df40862 (diff) | |
| download | openbmc-04b85e9f7cb38c97af7b30d45f912c48183f06e0.tar.xz | |
phosphor-host-ipmid: Move to python3
Bump the revision and use python3native
(From meta-phosphor rev: 06fe96971a3201fc1f263f1ef5208e7b699604bb)
Change-Id: Ia715f3b14f48a3430b8c0bb3257d3a274af7129a
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
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: |