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

[Florian Weimer]

Author: fw
Date: 2005-10-20 08:57:39 +0000 (Thu, 20 Oct 2005)
New Revision: 2476

Modified:
   lib/python/security_db.py
Log:
 r261 at deneb:  fw | 2005-09-29 21:07:03 +0200
 lib/python/security_db.py (DB.readBugs):
   Fix typo.
 (DB.calculateVulnerabilities):
   No version number checks between etch and unstable. 

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2005-10-20 08:28:24 UTC (rev 2475)
+++ lib/python/security_db.py	2005-10-20 08:57:39 UTC (rev 2476)
@@ -703,7 +703,7 @@
                                 ("%s: %d: version %s for package %s "
                                  + "conflicts with %s")
                                 % (bug.source_file, bug.source_line,
-                                   version, n.package, bug_source.name))
+                                   version, n.package, source_bug.name))
                             errors.append("%s: %d: location of %s"
                                           % (source_bug.source_file,
                                              source_bug.source_line,
@@ -838,13 +838,16 @@
         if self.verbose:
             print "calculateVulnerabilities:"
             print "  checking version consistency in package notes"
+
+        # Ignore etch because sarge issues may be fast-tracked into
+        # testing, bypassing unstable.
         for (bug_name, pkg_name, rel, unstable_ver, rel_ver) \
                 in list(cursor.execute(
         """SELECT a.bug_name, a.package, b.release,
         a.fixed_version, b.fixed_version
         FROM package_notes a, package_notes b
         WHERE a.bug_name = b.bug_name AND a.package = b.package
-        AND a.release = '' AND b.release <> ''
+        AND a.release = '' AND b.release NOT IN ('', 'etch')
         AND a.fixed_version IS NOT NULL
         AND a.fixed_version_id < b.fixed_version_id""")):
             b = bugs.BugFromDB(cursor, bug_name)