diff options
| author | Allen.Wang <Allen_Wang@quantatw.com> | 2022-03-07 12:05:21 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-03-08 00:48:57 +0300 |
| commit | 4818d0e67f65eeb3ac0d0947556c6a8dc41cdc79 (patch) | |
| tree | 19d2e30fb8814af83b817dfcf4e3c7fa6f281e7f /meta-openembedded/meta-python/recipes-devtools/python/python-daemon | |
| parent | 882b78b52ceabb3a0b63de4006738d92c8c55360 (diff) | |
| download | openbmc-4818d0e67f65eeb3ac0d0947556c6a8dc41cdc79.tar.xz | |
phosphor-settings-manager: Avoid build fail at non-clean build
To perform removing interfaces feature from:
https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/51394
phosphor-settings-manager build fail while rebuild without clean.
For example, add xxx.remove.yml contains a key:
/xyz/openbmc_project/control/host0/auto_reboot
Build will success at first build ,but rebuild will fail.
Error Message:
Traceback (most recent call last):
......
File "....../merge_settings.py", line 39, in dict_merge
target.pop(k)
KeyError: '/xyz/openbmc_project/control/host0/auto_reboot'
the key seems already be removed at first build so keyError occurs,
add key existence check before calling pop() to avoid this problem.
Signed-off-by: Allen.Wang <Allen_Wang@quantatw.com>
Change-Id: Id98c8b9d755ba6083b1df88159ad47a41286c4a1
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-daemon')
0 files changed, 0 insertions, 0 deletions