diff options
| author | Neil Williams <codehelp@debian.org> | 2022-02-15 14:31:42 +0000 |
|---|---|---|
| committer | Neil Williams <codehelp@debian.org> | 2022-02-15 14:31:42 +0000 |
| commit | 001347cd46337213de1ab445c7dc789f6ab55133 (patch) | |
| tree | 11487752184d8d48120ea85236b605b3a96fc7a9 /bin | |
| parent | 0833affe7c1eca24631042a9e3ad694bbdfcb1d1 (diff) | |
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.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/merge-cve-files | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/merge-cve-files b/bin/merge-cve-files index 55f487e2d5..36dee7acd5 100755 --- a/bin/merge-cve-files +++ b/bin/merge-cve-files @@ -6,7 +6,7 @@ # Copyright © 2020 Emilio Pozuelo Monfort <pochu@debian.org> # Copyright (c) 2021-2022 Neil Williams <codehelp@debian.org> -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) |