diff options
author | Emilio Pozuelo Monfort <pochu@debian.org> | 2023-03-20 14:58:00 +0100 |
---|---|---|
committer | Emilio Pozuelo Monfort <pochu@debian.org> | 2023-03-27 10:25:24 +0200 |
commit | c60cc24e47ae0c9532fa59676acabf8fbcba398f (patch) | |
tree | ea11f88048b8ab08086cd735a908be795350bd0d /bin | |
parent | 69712f5a48bfcb26510dcc281021d1b054a79802 (diff) |
sectracker.parsers: make cvelist et al return a list of Bugs
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/grab-cve-in-fix | 2 | ||||
-rwxr-xr-x | bin/merge-cve-files | 12 | ||||
-rwxr-xr-x | bin/remove-cve-dist-tags | 7 | ||||
-rwxr-xr-x | bin/update-vuln | 2 |
4 files changed, 5 insertions, 18 deletions
diff --git a/bin/grab-cve-in-fix b/bin/grab-cve-in-fix index ec65e776b7..20448a7215 100755 --- a/bin/grab-cve-in-fix +++ b/bin/grab-cve-in-fix @@ -85,7 +85,7 @@ class ParseChanges: def _read_cvelist(self): os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))) - data, _ = cvelist("data/CVE/list") # pylint: disable=no-value-for-parameter + data = cvelist("data/CVE/list") for cve in self.cves: for bug in data: if bug.header.name == cve: diff --git a/bin/merge-cve-files b/bin/merge-cve-files index 7ce47545b5..897eddabb4 100755 --- a/bin/merge-cve-files +++ b/bin/merge-cve-files @@ -105,14 +105,6 @@ def merge_annotations(annotations, new_annotation): return annotations -def parse_list(path): - data, messages = cvelist(path) - - for m in messages: - sys.stderr.write(str(m) + "\n") - - return data - if len(sys.argv) not in (2, 3): print(f"Usage: {os.path.basename(sys.argv[0])} (CVE/list) extra-cve-list") sys.exit(1) @@ -124,8 +116,8 @@ else: extra_list = sys.argv[-1] -data = parse_list(main_list) -extra_data = parse_list(extra_list) +data = cvelist(main_list) +extra_data = cvelist(extra_list) for extra_bug in extra_data: bug = next(bug for bug in data if bug.header.name == extra_bug.header.name) diff --git a/bin/remove-cve-dist-tags b/bin/remove-cve-dist-tags index 170505684b..8b06a12324 100755 --- a/bin/remove-cve-dist-tags +++ b/bin/remove-cve-dist-tags @@ -25,11 +25,6 @@ def keep_annotation(cve, annotation): return True -def parse_list(path): - data, messages = cvelist(path) - - return data - if len(sys.argv) <= 3: # assume there are no CVEs, so nothing to do sys.exit(0) @@ -46,7 +41,7 @@ for release in releases: if 'maincvefile' in distconfig: main_list = os.path.dirname(__file__) + '/../' + distconfig['maincvefile'] -data = parse_list(main_list) +data = cvelist(main_list) new_data = [] for cve in data: diff --git a/bin/update-vuln b/bin/update-vuln index 660d61b9d3..040bc6d47a 100755 --- a/bin/update-vuln +++ b/bin/update-vuln @@ -81,7 +81,7 @@ class ParseUpdates: def _read_cvelist(self): """Build a list of Bug items for the CVE from data/CVE/list""" os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(__file__)))) - data, _ = cvelist("data/CVE/list") # pylint: disable=no-value-for-parameter + data = cvelist("data/CVE/list") for cve in self.cves: for bug in data: if bug.header.name == cve: |