[Secure-testing-commits] r28693 - data lib/python

[Holger Levsen]

Author: holger
Date: 2014-09-10 15:25:22 +0000 (Wed, 10 Sep 2014)
New Revision: 28693

Modified:
   data/dla-needed.txt
   lib/python/security_db.py
Log:
ruby... there are 1.8, 2.0 and 2.1 source packages(names). and 1.9.1

Modified: data/dla-needed.txt
===================================================================
--- data/dla-needed.txt	2014-09-10 15:13:00 UTC (rev 28692)
+++ data/dla-needed.txt	2014-09-10 15:25:22 UTC (rev 28693)
@@ -54,7 +54,7 @@
 --
 ruby1.8
 --
-ruby1.9
+ruby1.9.1
 --
 tomcat6 (Holger Levsen and Tony Mancill)
 --

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2014-09-10 15:13:00 UTC (rev 28692)
+++ lib/python/security_db.py	2014-09-10 15:25:22 UTC (rev 28693)
@@ -1570,10 +1570,10 @@
             """SELECT string_list(release) AS releases, version
             FROM (SELECT release, version FROM source_packages
             WHERE name = ?
-            AND release IN ('squeeze', 'wheezy', 'jessie', 'sid')
-            ORDER BY release_to_number(release))
+            AND release IN ('squeeze', 'wheezy', 'jessie', 'sid'))
             GROUP BY version""", (pkg,)):
             yield releases.split(', '), version
+#            ORDER BY release_to_number(release))
 
     def getBinaryPackageVersions(self, cursor, pkg):
         """A generator which returns tuples (RELEASE-LIST,
@@ -1585,10 +1585,10 @@
             FROM (SELECT release, source, version, string_set(archs) AS archs
             FROM binary_packages
             WHERE name = ?
-            GROUP BY release, source, version
-            ORDER BY release_to_number(release))
+            GROUP BY release, source, version)
             GROUP BY source, version, archs""", (pkg,)):
             yield releases.split(', '), source, version, archs.split(',')
+#            ORDER BY release_to_number(release))
 
     def getBinaryPackagesForSource(self, cursor, pkg):
         """A generator which returns tuples (PACKAGES, RELEASE-LIST,