From bb6f093a21db58dc30890853681074c99222800a Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Wed, 3 Nov 2021 13:24:39 +0100 Subject: bin/remove-cve-dist-tags: accept multiple releases The release argument is a comma-separated list now. --- bin/remove-cve-dist-tags | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/remove-cve-dist-tags b/bin/remove-cve-dist-tags index c428127092..6e8d7214eb 100755 --- a/bin/remove-cve-dist-tags +++ b/bin/remove-cve-dist-tags @@ -17,9 +17,9 @@ def keep_annotation(cve, annotation): return True if cve.header.name in cves and \ - annotation.release == release and \ + annotation.release in releases and \ annotation.package == package: - print(f"removing annotation for {cve.header.name}/{package}/{release}") + print(f"removing annotation for {cve.header.name}/{package}/{annotation.release}") return False return True @@ -34,15 +34,17 @@ if len(sys.argv) <= 3: # assume there are no CVEs, so nothing to do sys.exit(0) -release = sys.argv[1] +releases = sys.argv[1].split(",") package = sys.argv[2] cves = sys.argv[3:] main_list = os.path.dirname(__file__) + '/../data/CVE/list' # check if another file was specified in config, e.g. a ExtendedFile -distconfig = config.get_config()[release] -if 'maincvefile' in distconfig: - main_list = os.path.dirname(__file__) + '/../' + distconfig['maincvefile'] + +for release in releases: + distconfig = config.get_config()[release] + if 'maincvefile' in distconfig: + main_list = os.path.dirname(__file__) + '/../' + distconfig['maincvefile'] data = parse_list(main_list) new_data = [] -- cgit v1.2.3