tracker_service: don't hardcode codenames in db queries

1 files changed, 11 insertions, 12 deletions

diff --git a/bin/tracker_service.py b/bin/tracker_service.py
index fbc9eb4c32..e4d76af029 100755
--- a/bin/tracker_service.py
+++ b/bin/tracker_service.py
@@ -914,18 +914,19 @@ to improve our documentation and procedures, so feedback is welcome.""")])])
                 (SELECT testing.version_id < stable.version_id
                  FROM source_packages AS testing, source_packages AS stable
                  WHERE testing.name = testing_status.package
-                 AND testing.release = 'bullseye'
+                 AND testing.release = ?
                  AND testing.subrelease = ''
                  AND testing.archive = testing_status.section
                  AND stable.name = testing_status.package
-                 AND stable.release = 'buster'
+                 AND stable.release = ?
                  AND stable.subrelease = 'security'
                  AND stable.archive = testing_status.section),
                 (SELECT range_remote FROM nvd_data
                  WHERE cve_name = bug)
                 FROM testing_status
                 WHERE (NOT unstable_vulnerable)
-                AND (NOT testing_security_fixed)"""):
+                AND (NOT testing_security_fixed)""",
+                (config.get_release_codename('testing'), config.get_release_codename('stable'))):
                 if bf.urgencyFiltered(urgency, vulnerable):
                     continue
                 if bf.remoteFiltered(remote):
@@ -999,14 +1000,13 @@ checker to find out why they have not entered testing yet."""),
             old_pkg = ''
             old_dsc = ''
             last_displayed = ''
-            releases = ('sid', 'bullseye', 'buster', 'stretch', 'jessie')
+            releases = config.get_supported_releases()
             for (pkg_name, bug_name, release, desc) in self.db.cursor().execute(
                     """SELECT DISTINCT sp.name, st.bug_name, sp.release,
                     bugs.description
                     FROM source_package_status AS st, source_packages AS sp, bugs
                     WHERE st.vulnerable == 2 AND sp.rowid = st.package
-                    AND ( sp.release = ? OR sp.release = ? OR sp.release = ?
-                    OR sp.release = ? OR sp.release = ? )
+                    AND sp.release IN (""" + ",".join("?" * len(releases)) + """)
                     AND sp.subrelease = '' AND st.bug_name == bugs.name
                     ORDER BY sp.name, st.bug_name""", releases):
 
@@ -1044,14 +1044,14 @@ checker to find out why they have not entered testing yet."""),
             old_dsc = ''
             old_name = ''
             last_displayed = ''
-            releases = ('sid', 'bullseye', 'buster', 'stretch', 'jessie')
+            releases = config.get_supported_releases()
             for (pkg_name, bug_name, release, desc) in self.db.cursor().execute(
                     """SELECT DISTINCT sp.name, st.bug_name, sp.release,
                     bugs.description
                     FROM source_package_status AS st, source_packages AS sp, bugs
                     WHERE st.vulnerable > 0 AND sp.rowid = st.package
-                    AND ( sp.release = ? OR sp.release = ? OR sp.release = ?
-                    OR sp.release = ? OR sp.release = ? ) AND st.urgency == 'unimportant'
+                    AND sp.release IN (""" + ",".join("?" * len(releases)) +  """)
+                    AND st.urgency == 'unimportant'
                     AND sp.subrelease = '' AND st.bug_name == bugs.name
                     ORDER BY sp.name, st.bug_name""", releases):
 
@@ -1330,7 +1330,7 @@ Debian bug number.'''),
         urgency = defaultdict(lambda: defaultdict(dict))
         nodsa = defaultdict(lambda: defaultdict(dict))
         nodsa_reason = defaultdict(lambda: defaultdict(dict))
-        supported_releases = ('sid', 'bullseye', 'buster', 'stretch', 'jessie')
+        supported_releases = config.get_supported_releases()
         for (pkg, issue, desc, debianbug, release, subrelease, db_version, db_fixed_version, db_status, db_urgency, db_remote, db_nodsa, db_nodsa_reason) in self.db.cursor().execute(
                 """SELECT sp.name, st.bug_name,
                 (SELECT cve_desc FROM nvd_data
@@ -1355,8 +1355,7 @@ Debian bug number.'''),
                 FROM source_package_status AS st, source_packages AS sp, bugs
                 WHERE sp.rowid = st.package AND st.bug_name = bugs.name
                 AND ( st.bug_name LIKE 'CVE-%' OR st.bug_name LIKE 'TEMP-%' )
-                AND ( sp.release = ? OR sp.release = ? OR sp.release = ?
-                OR sp.release = ? OR sp.release = ? )
+                AND sp.release IN (""" + ",".join("?" * len(supported_releases)) + """)
                 ORDER BY sp.name, st.bug_name, sp.release, sp.subrelease""" , supported_releases):
 
             ### to ease debugging...: