srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-11-30 12:56:01 +00:00
Code Issues Releases Activity

fifloader: co-operatively merge settings from ProductDefaults

Browse Source 
This allows us to set defaults for settings in ProductDefaults
and have the settings dicts in individual products merge with
them, not overwrite them.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2025-10-15 17:45:28 -07:00
parent 4b79665c02
commit b1b021ffd6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fifloader.py
View File

@ -183,6 +183,10 @@ def merge_inputs(inputs, validate=False, clean=False):
schema_validate(data, fif=True, state="predefault") schema_validate(data, fif=True, state="predefault")
for (pname, product) in data["Products"].items(): for (pname, product) in data["Products"].items():
temp = dict(data.get("ProductDefaults", {})) temp = dict(data.get("ProductDefaults", {}))
if "settings" in product and "settings" in temp:
# merge settings co-operatively
prodsetts = product.pop("settings")
temp["settings"].update(prodsetts)
temp.update(product) temp.update(product)
data["Products"][pname] = temp data["Products"][pname] = temp
# validate against incomplete schema # validate against incomplete schema