tree 19d2e30fb8814af83b817dfcf4e3c7fa6f281e7f
parent 882b78b52ceabb3a0b63de4006738d92c8c55360
author Allen.Wang <Allen_Wang@quantatw.com> 1646643921 +0800
committer Patrick Williams <patrick@stwcx.xyz> 1646689737 +0000

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