diff options
| author | Andrew Geissler <openbmcbump-github@yahoo.com> | 2020-04-02 16:11:28 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-04-03 00:14:25 +0300 |
| commit | 384f1909f842aeb25c2ae1ec0245985cd298cad7 (patch) | |
| tree | 3c55b2a48d7bfa2efa5092a4fb7e2a8243bb84cf /meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager | |
| parent | 5d0011f5327f25dea62bba0e0b5078448cc624cc (diff) | |
| download | openbmc-384f1909f842aeb25c2ae1ec0245985cd298cad7.tar.xz | |
phosphor-settingsd: srcrev bump 3d805fe94a..6f62cc844b
And convert recipe to python3.
Patrick Williams (3):
python2 to python3 conversion
MAINTAINERS: update Deepak's email address
delete deprecated python scripts
(From meta-phosphor rev: afc2415faf43876cd80ed9a93229a7e7e2499b31)
Change-Id: I62f4df660fc589a084f8d48effb6cfe2d82ae4da
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager')
| -rwxr-xr-x | meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py index 01f5e3552..d910da5ba 100755 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Loads a "target" YAML file and overwrites its values with values from "override" YAML files. @@ -28,7 +28,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: |