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

[Florian Weimer]

Author: fw
Date: 2006-09-17 20:54:22 +0000 (Sun, 17 Sep 2006)
New Revision: 4738

Modified:
   lib/python/security_db.py
Log:
Do not enforce version ordering between different suites.
The archive currently violates this constraint.


Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2006-09-17 20:12:57 UTC (rev 4737)
+++ lib/python/security_db.py	2006-09-17 20:54:22 UTC (rev 4738)
@@ -942,24 +942,27 @@
             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 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)
-            result.append("%s:%d: inconsistent versions for package %s"
-                          % (b.source_file, b.source_line, pkg_name))
-            result.append("%s:%d: unstable: %s"
-                          % (b.source_file, b.source_line, unstable_ver))
-            result.append("%s:%d: release %s: %s"
-                          % (b.source_file, b.source_line, `rel`, rel_ver))
+        # The following does not work because stable->security ->
+        # testing -> unstable propagation is no longer available.
+        if False:
+            # 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 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)
+                result.append("%s:%d: inconsistent versions for package %s"
+                              % (b.source_file, b.source_line, pkg_name))
+                result.append("%s:%d: unstable: %s"
+                              % (b.source_file, b.source_line, unstable_ver))
+                result.append("%s:%d: release %s: %s"
+                              % (b.source_file, b.source_line, `rel`, rel_ver))
 
         if self.verbose:
             print "  checking source/binary packages"