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.

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@28819 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 13 insertions, 6 deletions

diff --git a/lib/python/security_db.py b/lib/python/security_db.py
index 0cc978822a..ea6a4360e0 100644
--- a/lib/python/security_db.py
+++ b/lib/python/security_db.py
@@ -432,6 +432,14 @@ class DB:
                 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 @@ class DB:
         """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,