[Secure-testing-commits] r7720 - lib/python

[fw at alioth.debian.org]

Author: fw
Date: 2007-12-25 17:55:56 +0000 (Tue, 25 Dec 2007)
New Revision: 7720

Modified:
   lib/python/bugs.py
Log:
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.


Modified: lib/python/bugs.py
===================================================================
--- lib/python/bugs.py	2007-12-25 17:55:54 UTC (rev 7719)
+++ lib/python/bugs.py	2007-12-25 17:55:56 UTC (rev 7720)
@@ -386,12 +386,8 @@
     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 @@
                     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):