From: Clark Williams williams@redhat.com
redhat/configs: modify merge.py to match old overrides input
Change overrides file input to only use the first instance of a config that is specified and ignore any duplicates encountered after that.
Suggested-by: Herton R. Krzesinski herton@redhat.com 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 @@ -60,7 +60,8 @@ if len(sys.argv) == 4: overrides = {} with open(override_file, "rt", encoding="utf-8") as f: for line in [l.strip() for l in f.readlines()]: - if c := find_config(line): + c = find_config(line) + if c and c not in overrides: overrides[c] = line
# now read and print the base config, checking each line
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2262