Neil Williams pushed to branch master at Debian Security Tracker / security-tracker
Commits: 001347cd by Neil Williams at 2022-02-15T14:31:42+00:00 Allow merge-cve-files to let RESERVED through Avoid merge-cve-files stumbling over FlagAnnotations like RESERVED and REJECTED. Also add code to tidy up the .xpck files that can be generated by the merge process. - - - - - 1 changed file: - bin/merge-cve-files Changes: ===================================== bin/merge-cve-files ===================================== @@ -6,7 +6,7 @@ # Copyright © 2020 Emilio Pozuelo Monfort <[email protected]> # Copyright (c) 2021-2022 Neil Williams <[email protected]> -import os.path +import os import sys import setup_paths # noqa @@ -129,6 +129,8 @@ for extra_bug in extra_data: notes = {} new_annotations = bug.annotations for extra_annotation in extra_bug.annotations: + if isinstance(extra_annotation, FlagAnnotation): + continue if isinstance(extra_annotation, StringAnnotation): cve = f"{extra_bug.header.name}" note_tag = notes.setdefault(cve, []) @@ -142,3 +144,8 @@ for extra_bug in extra_data: with open(main_list, 'w') as f: writecvelist(data, f) + +# check for and erase an .xpck file built from the merge +xpck = f"{extra_list}.xpck" +if os.path.exists(xpck): + os.unlink(xpck) View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/001347cd46337213de1ab445c7dc789f6ab55133 -- View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/001347cd46337213de1ab445c7dc789f6ab55133 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-security-tracker-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-security-tracker-commits
