From: Patrick Talbert ptalbert@redhat.com
redhat: use 'update' method in merge.py
Use the update method to update our baseconfigs dictionary rather than iterating
Signed-off-by: Clark Williams williams@redhat.com
diff --git a/redhat/configs/merge.py b/redhat/configs/merge.py index blahblah..blahblah 100755 --- a/redhat/configs/merge.py +++ b/redhat/configs/merge.py @@ -50,9 +50,8 @@ if not os.path.exists(sys.argv[2]): usage("base config file %s does not exist!" % sys.argv[2]) baseconfigs = read_config_file(sys.argv[2])
-# iterate over the overrides, replacing values in the base config -for v in overrides.keys(): - baseconfigs[v] = overrides[v] +# update baseconfigs with the overrides values +baseconfigs.update(overrides)
# print the new config to stdout for v in baseconfigs.keys():
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2117