[Secure-testing-commits] r28819 - bin lib/python

[Holger Levsen]

Author: holger
Date: 2014-09-16 09:09:48 +0000 (Tue, 16 Sep 2014)
New Revision: 28819

Modified:
   bin/tracker_service.py
   lib/python/security_db.py
Log:
Correctly display all repositories in tabular view. (Closes: #742382, #742855)

Include oldstable/stable security and olstable-lts repositories
in tabular view and sort all repositories in correct order.

Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2014-09-16 09:09:45 UTC (rev 28818)
+++ bin/tracker_service.py	2014-09-16 09:09:48 UTC (rev 28819)
@@ -549,19 +549,18 @@
         pkg = path[0]
 
         def gen_versions():
-            for (releases, version) in self.db.getSourcePackageVersions(
-                self.db.cursor(), pkg):
-                yield ', '.join(releases), version
+            for (release, version) in self.db.getSourcePackageVersions(
+                    self.db.cursor(), pkg):
+                yield release, version
         def gen_bug_list(lst):
             for (bug, description) in lst:
                 yield self.make_xref(url, bug), description
 
         suites = ()
-        for (releases, version) in self.db.getSourcePackageVersions(
+        for (release, version) in self.db.getSourcePackageVersions(
             self.db.cursor(), pkg):
-            for r in releases:
-                if r not in suites:
-                    suites = suites + (r,)
+                if release not in suites:
+                    suites = suites + (release,)
 
         def gen_summary(bugs):
             for (bug, description) in bugs:

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2014-09-16 09:09:45 UTC (rev 28818)
+++ lib/python/security_db.py	2014-09-16 09:09:48 UTC (rev 28819)
@@ -432,6 +432,14 @@
                 return -1
         self.db.createscalarfunction("release_to_number", release_to_number, 1)
 
+        subreleases = ['', 'security', 'lts']
+        def subrelease_to_number(u):
+            try:
+                return subreleases.index(u)
+            except ValueError:
+                return -1
+        self.db.createscalarfunction("subrelease_to_number", subrelease_to_number, 1)
+
         def release_name(release, subrelease, archive):
             if archive <> 'main':
                 release = release + '/' + archive
@@ -1566,14 +1574,13 @@
         """A generator which returns tuples (RELEASE-LIST, VERSION),
         the available versions of the source package pkg."""
 
-        for (releases, version) in cursor.execute(
-            """SELECT string_list(release) AS releases, version
-            FROM (SELECT release, version FROM source_packages
+        for (release, version) in cursor.execute(
+            """SELECT release_name(release, subrelease, archive)
+            AS release, version FROM source_packages
             WHERE name = ?
             AND release IN ('squeeze', 'wheezy', 'jessie', 'sid')
-            ORDER BY release_to_number(release))
-            GROUP BY version""", (pkg,)):
-            yield releases.split(', '), version
+            ORDER BY release_to_number(release), subrelease_to_number(subrelease)""", (pkg,)):
+            yield release, version
 
     def getBinaryPackageVersions(self, cursor, pkg):
         """A generator which returns tuples (RELEASE-LIST,