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

[Florian Weimer]

Author: fw
Date: 2005-09-23 12:45:15 +0000 (Fri, 23 Sep 2005)
New Revision: 2135

Modified:
   lib/python/security_db.py
Log:
lib/python/security_db.py (DB.getBinaryPackageVersions):
  Include architecture information in the result.


Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2005-09-23 11:47:34 UTC (rev 2134)
+++ lib/python/security_db.py	2005-09-23 12:45:15 UTC (rev 2135)
@@ -1208,18 +1208,19 @@
             yield releases.split(', '), version
 
     def getBinaryPackageVersions(self, cursor, pkg):
-        """A generator which returns tuples (RELEASE-LIST, VERSION),
-        the available versions of the source package pkg."""
+        """A generator which returns tuples (RELEASE-LIST,
+        SOURCE-PACKAGE, VERSION, ARCH-LIST), the available versions of
+        the binary package pkg."""
 
-        for (releases, version, archs) in cursor.execute(
-            """SELECT string_list(release) AS releases, version, archs
-            FROM (SELECT release, version, string_set(archs) AS archs
+        for (releases, source, version, archs) in cursor.execute(
+            """SELECT string_list(release) AS releases, source, version, archs
+            FROM (SELECT release, source, version, string_set(archs) AS archs
             FROM binary_packages
             WHERE name = ?
-            GROUP BY release, version
+            GROUP BY release, source, version
             ORDER BY release_to_number(release))
-            GROUP BY version, archs""", (pkg,)):
-            yield releases.split(', '), version, archs.split(',')
+            GROUP BY source, version, archs""", (pkg,)):
+            yield releases.split(', '), source, version, archs.split(',')
 
     def getBinaryPackagesForSource(self, cursor, pkg):
         """A generator which returns tuples (PACKAGES, RELEASE-LIST,