Hi, we really need to refactor the codebase eventually ;-) I've thought about treating backports as subrelease, but I've came to the conclusion that would be wrong. See attached. cheers, Holger
From aaee1f290a7d96f8dcdff412fd9207b0a5a77bc2 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 16 Sep 2014 01:08:08 +0200
Subject: [PATCH] Include squeeze- and wheezy-backports in issue and package
views. (Closes: #664866)
---
bin/tracker_service.py | 4 ++--
lib/python/security_db.py | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/tracker_service.py b/bin/tracker_service.py
index 69efa14..61552e8 100644
--- a/bin/tracker_service.py
+++ b/bin/tracker_service.py
@@ -914,7 +914,7 @@ checker to find out why they have not entered testing yet."""),
old_pkg = ''
old_dsc = ''
last_displayed = ''
- releases = ('sid', 'jessie', 'wheezy', 'squeeze')
+ releases = ('sid', 'jessie', 'wheezy-backports', 'wheezy', 'squeeze', 'squeeze-backports')
for (pkg_name, bug_name, release, desc) in self.db.cursor().execute(
"""SELECT DISTINCT sp.name, st.bug_name, sp.release,
bugs.description
@@ -959,7 +959,7 @@ checker to find out why they have not entered testing yet."""),
old_dsc = ''
old_name = ''
last_displayed = ''
- releases = ('sid', 'jessie', 'wheezy', 'squeeze')
+ releases = ('sid', 'jessie', 'wheezy-backports', 'wheezy', 'squeeze', 'squeeze-backports')
for (pkg_name, bug_name, release, desc) in self.db.cursor().execute(
"""SELECT DISTINCT sp.name, st.bug_name, sp.release,
bugs.description
diff --git a/lib/python/security_db.py b/lib/python/security_db.py
index 8b79ac6..4130449 100644
--- a/lib/python/security_db.py
+++ b/lib/python/security_db.py
@@ -424,7 +424,7 @@ class DB:
return 999
self.db.createscalarfunction("urgency_to_number", urgency_to_number, 1)
- releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy', 'jessie', 'sid']
+ releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'squeeze-backports', 'wheezy', 'wheezy-backports', 'jessie', 'sid']
def release_to_number(u):
try:
return releases.index(u)
@@ -1530,7 +1530,7 @@ class DB:
store_value('release/1/' + release, '\n'.join(result))
- for release in ('sid', 'squeeze', 'wheezy', 'jessie'):
+ for release in ('sid', 'jessie', 'wheezy', 'squeeze'):
gen_release(release)
result = result_start
@@ -1580,7 +1580,7 @@ class DB:
"""SELECT release_name(release, subrelease, archive)
AS release, version FROM source_packages
WHERE name = ?
- AND release IN ('squeeze', 'wheezy', 'jessie', 'sid')
+ AND release IN ('squeeze', 'squeeze-backports', 'wheezy', 'wheezy-backports', 'jessie', 'sid')
ORDER BY release_to_number(release), subrelease_to_number(subrelease)""", (pkg,)):
yield release, version
@@ -1634,7 +1634,7 @@ class DB:
p.version AS version, s.vulnerable AS vulnerable
FROM source_package_status AS s, source_packages AS p
WHERE s.bug_name = ? AND p.rowid = s.package
- AND release in ('squeeze', 'wheezy', 'jessie', 'sid')
+ AND release in ('squeeze', 'squeeze-backports', 'wheezy', 'wheezy-backports', 'jessie', 'sid')
ORDER BY release_to_number(p.release), p.subrelease)
GROUP BY package, version, vulnerable
ORDER BY package, version COLLATE version""",
@@ -1684,7 +1684,7 @@ class DB:
st.urgency = 'unimportant' OR NOT vulnerable AS unimportant
FROM source_packages AS sp, source_package_status AS st, bugs
WHERE sp.name = ?
- AND sp.release IN ('squeeze', 'wheezy', 'jessie', 'sid')
+ AND sp.release IN ('squeeze', 'squeeze-backports', 'wheezy', 'wheezy-backports', 'jessie', 'sid')
AND sp.subrelease <> 'security' AND sp.subrelease <> 'lts'
AND st.package = sp.rowid
AND bugs.name = st.bug_name
--
1.9.1
Attachment:
signature.asc
Description: This is a digitally signed message part.