Rejected CVEs with package notes are no longer an error

Without this change, an update from the CVE database may result
in failed consistency checks, which is not desirable.

In a later commit, the web front end will be extended to list
such CVE entries.  This will provide interested parties with
a means to perform cleanups.


git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@7720 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 5 insertions, 10 deletions

diff --git a/lib/python/bugs.py b/lib/python/bugs.py
index 4efea286fd..89d75269b9 100644
--- a/lib/python/bugs.py
+++ b/lib/python/bugs.py
@@ -386,12 +386,8 @@ class BugReservedCVE(BugBase):
     def cveStatus(self):
         return 'RESERVED'
 
-class BugRejectedCVE(BugBase):
+class BugRejectedCVE(Bug):
     """Class for rejected CVE entries."""
-    def __init__(self, fname, lineno, name):
-        BugBase.__init__(self, fname, lineno, None, name, "REJECTED", [])
-        # for-us bugs are upgraded to real Bug objects.
-        self.not_for_us = True
     def cveStatus(self):
         return 'REJECTED'
 
@@ -659,11 +655,10 @@ class FileBase(debian_support.PackageFile):
                     self.raiseSyntaxError\
                         ('rejected CVE entries must have CVE names',
                          first_lineno)
-                if len(pkg_notes) > 0:
-                    self.raiseSyntaxError\
-                        ('rejected CVE entries must not have notes',
-                         first_lineno)
-                yield BugRejectedCVE(self.file.name, first_lineno, record_name)
+                yield self.finishBug(BugRejectedCVE(
+                        self.file.name, first_lineno, date,
+                        record_name, description,
+                        comments, notes=pkg_notes, xref=xref))
 
             elif not_for_us is not None:
                 if not self.isUniqueName(record_name):