Hi, commit b22f1ba0cd9499e716f7b729f546a98bd4950dda Author: Holger Levsen <hol...@layer-acht.org> Date: Sat Sep 13 01:47:11 2014 +0200
Display oldstable/stable security and olstable-lts repositories
in tabular view. (Closes: #742382)
diff --git a/bin/tracker_service.py b/bin/tracker_service.py
index fb3fd27..48ad599 100644
--- a/bin/tracker_service.py
+++ b/bin/tracker_service.py
@@ -545,19 +545,18 @@ to improve our documentation and procedures, so feedback
is welcome.""")])])
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:
diff --git a/lib/python/security_db.py b/lib/python/security_db.py
index b15924e..4a4a2b7 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,
cheers,
Holger
signature.asc
Description: This is a digitally signed message part.
