From: Clark Williams <[email protected]> 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 <[email protected]> Signed-off-by: Clark Williams <[email protected]> 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 _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected] Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
