security_db: Update mappings after stretch stable release

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

1 files changed, 16 insertions, 16 deletions

diff --git a/lib/python/security_db.py b/lib/python/security_db.py
index e018fff055..21134bc78c 100644
--- a/lib/python/security_db.py
+++ b/lib/python/security_db.py
@@ -476,7 +476,7 @@ class DB:
             COALESCE((SELECT NOT vulnerable
             FROM source_packages AS tsecp, source_package_status AS tsecst
             WHERE tsecp.name = sp.name
-            AND tsecp.release = 'stretch' AND tsecp.subrelease = 'security'
+            AND tsecp.release = 'buster' AND tsecp.subrelease = 'security'
             AND tsecp.archive = sp.archive
             AND tsecst.bug_name = st.bug_name
             AND tsecst.package = tsecp.rowid), 0) AS testing_security_fixed,
@@ -485,13 +485,13 @@ class DB:
             (EXISTS (SELECT * FROM package_notes_nodsa AS pnd
             WHERE pnd.bug_name = st.bug_name
             AND pnd.package = sp.name
-            AND pnd.release = 'stretch')) AS no_dsa
+            AND pnd.release = 'buster')) AS no_dsa
             FROM source_package_status AS st, source_packages AS sp
             WHERE st.vulnerable > 0 AND sp.rowid = st.package
-            AND sp.release = 'stretch' AND sp.subrelease = ''
+            AND sp.release = 'buster' AND sp.subrelease = ''
             ORDER BY sp.name, st.urgency, st.bug_name""")
 
-        for (name, nickname) in (('stable', 'jessie'), ('oldstable', 'wheezy'), ('oldoldstable', 'squeeze'),):
+        for (name, nickname) in (('stable', 'stretch'), ('oldstable', 'jessie'), ('oldoldstable', 'wheezy'),):
             cursor.execute(
                 """CREATE TEMPORARY VIEW %s_status AS
                 SELECT DISTINCT sp.name AS package, st.bug_name AS bug,
@@ -575,7 +575,7 @@ class DB:
                 return -1
         self.db.createscalarfunction("subreleasepart_to_number", subreleasepart_to_number, 1)
 
-        releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid']
+        releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy', 'jessie', 'stretch', 'buster', 'sid']
         def release_to_number(u):
             try:
                 return releases.index(u)
@@ -1112,7 +1112,7 @@ class DB:
         """Calculate vulnerable packages.
 
         To each package note, a release-specific vulnerability status
-        is attached.  Currently, only stretch/testing is processed.
+        is attached.  Currently, only buster/testing is processed.
 
         Returns a list strings describing inconsistencies.
         """
@@ -1128,7 +1128,7 @@ class DB:
         # The following does not work because stable->security ->
         # testing -> unstable propagation is no longer available.
         if False:
-            # Ignore stretch/testing because stable issues may be
+            # Ignore buster/testing because stable issues may be
             # fast-tracked into testing, bypassing unstable.
             for (bug_name, pkg_name, rel, unstable_ver, rel_ver) \
                     in list(cursor.execute(
@@ -1136,7 +1136,7 @@ class DB:
             a.fixed_version, b.fixed_version
             FROM package_notes a, package_notes b
             WHERE a.bug_name = b.bug_name AND a.package = b.package
-            AND a.release = '' AND b.release NOT IN ('', 'stretch')
+            AND a.release = '' AND b.release NOT IN ('', 'buster')
             AND a.fixed_version IS NOT NULL
             AND a.fixed_version_id < b.fixed_version_id""")):
                 b = bugs.BugFromDB(cursor, bug_name)
@@ -1252,10 +1252,10 @@ class DB:
             "SELECT name FROM bugs WHERE NOT not_for_us"):
 
             self._calcUnstable(c, bug_name)
-            self._calcTesting(c, bug_name, 'testing', 'stretch')
-            self._calcTesting(c, bug_name, 'stable', 'jessie')
-            self._calcTesting(c, bug_name, 'oldstable', 'wheezy')
-            self._calcTesting(c, bug_name, 'oldoldstable', 'squeeze')
+            self._calcTesting(c, bug_name, 'testing', 'buster')
+            self._calcTesting(c, bug_name, 'stable', 'stretch')
+            self._calcTesting(c, bug_name, 'oldstable', 'jessie')
+            self._calcTesting(c, bug_name, 'oldoldstable', 'wheezy')
 
         return result
 
@@ -1704,7 +1704,7 @@ class DB:
 
             store_value('release/1/' + release, '\n'.join(result))
 
-        for release in ('sid', 'squeeze', 'wheezy', 'jessie', 'stretch'):
+        for release in ('sid', 'wheezy', 'jessie', 'stretch', 'buster'):
             gen_release(release)
 
         result = result_start
@@ -1717,7 +1717,7 @@ class DB:
 
     def calculateDebsecan(self):
         """Calculate all debsecan data."""
-        for release in ('', 'squeeze', 'wheezy', 'jessie', 'stretch'):
+        for release in ('', 'wheezy', 'jessie', 'stretch', 'buster'):
             self.calculateDebsecan0(release)
         self.calculateDebsecan1()
 
@@ -1754,7 +1754,7 @@ class DB:
             """SELECT release_name(release, subrelease, archive)
             AS release, version FROM source_packages
             WHERE name = ?
-            AND release IN ('squeeze', 'wheezy', 'jessie', 'stretch', 'sid')
+            AND release IN ('wheezy', 'jessie', 'stretch', 'buster', 'sid')
             GROUP BY release, version
             ORDER BY release_to_number(release), subrelease_to_number(subrelease), version COLLATE version""", (pkg,)):
             yield release, version
@@ -1809,7 +1809,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', 'stretch', 'sid'))
+            AND release in ('wheezy', 'jessie', 'stretch', 'buster', 'sid'))
             GROUP BY package, version, vulnerable
             ORDER BY package, releasepart_to_number(release), subreleasepart_to_number(release), version COLLATE version""",
             (bug,)):