sectracker.parsers: make cvelist et al return a list of Bugs

1 files changed, 2 insertions, 10 deletions

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)