First round of adjustments for the etch release

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

2 files changed, 14 insertions, 13 deletions

diff --git a/lib/python/debian_support.py b/lib/python/debian_support.py
index d29e542835..e2eff3812a 100644
--- a/lib/python/debian_support.py
+++ b/lib/python/debian_support.py
@@ -233,7 +233,7 @@ class Release(PseudoEnum): pass
 
 def listReleases():
     releases = {}
-    rels = ("potato", "woody", "sarge", "etch", "sid")
+    rels = ("potato", "woody", "sarge", "etch", "lenny", "sid")
     for r in range(len(rels)):
         releases[rels[r]] = Release(rels[r], r)
     Release.releases = releases
diff --git a/lib/python/security_db.py b/lib/python/security_db.py
index 68514a6847..d3fb90bffc 100644
--- a/lib/python/security_db.py
+++ b/lib/python/security_db.py
@@ -368,10 +368,10 @@ 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 = 'etch')) AS no_dsa
+            AND pnd.release = 'lenny')) AS no_dsa
             FROM source_packages AS tsecp, source_package_status AS tsecst
             WHERE tsecp.name = sp.name
-            AND tsecp.release = 'etch' AND tsecp.subrelease = 'security'
+            AND tsecp.release = 'lenny' 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,
@@ -379,7 +379,7 @@ class DB:
              WHERE cve_name = st.bug_name) AS remote
             FROM source_package_status AS st, source_packages AS sp
             WHERE st.vulnerable AND st.urgency <> 'unimportant'
-            AND sp.rowid = st.package AND sp.release = 'etch'
+            AND sp.rowid = st.package AND sp.release = 'lenny'
             AND sp.subrelease = ''
             ORDER BY sp.name, urgency_to_number(st.urgency), st.bug_name""")
 
@@ -442,7 +442,7 @@ class DB:
                 return 999
         self.db.createscalarfunction("urgency_to_number", urgency_to_number, 1)
 
-        releases = ['potato', 'woody', 'sarge', 'etch', 'sid']
+        releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'sid']
         def release_to_number(u):
             try:
                 return releases.index(u)
@@ -938,7 +938,7 @@ class DB:
         """Calculate vulnerable packages.
 
         To each package note, a release-specific vulnerability status
-        is attached.  Currently, only etch/testing is processed.
+        is attached.  Currently, only lenny/testing is processed.
 
         Returns a list strings describing inconsistencies.
         """
@@ -954,15 +954,15 @@ class DB:
         # The following does not work because stable->security ->
         # testing -> unstable propagation is no longer available.
         if False:
-            # Ignore etch because sarge issues may be fast-tracked into
-            # testing, bypassing unstable.
+            # Ignore lenny/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(
             """SELECT a.bug_name, a.package, b.release,
             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 ('', 'etch')
+            AND a.release = '' AND b.release NOT IN ('', 'lenny')
             AND a.fixed_version IS NOT NULL
             AND a.fixed_version_id < b.fixed_version_id""")):
                 b = bugs.BugFromDB(cursor, bug_name)
@@ -1177,8 +1177,9 @@ class DB:
             "SELECT name FROM bugs WHERE NOT not_for_us"):
 
             self._calcUnstable(c, bug_name)
-            self._calcTesting(c, bug_name, 'testing', 'etch')
-            self._calcTesting(c, bug_name, 'stable', 'sarge')
+            self._calcTesting(c, bug_name, 'testing', 'lenny')
+            self._calcTesting(c, bug_name, 'stable', 'etch')
+            self._calcTesting(c, bug_name, 'oldstable', 'sarge')
 
         return result
 
@@ -1602,7 +1603,7 @@ class DB:
 
             store_value('release/1/' + release, '\n'.join(result))
 
-        for release in ('sid', 'etch', 'sarge', 'woody'):
+        for release in ('sid', 'etch', 'lenny', 'sarge'):
             gen_release(release)
 
         result = result_start
@@ -1615,7 +1616,7 @@ class DB:
                 
     def calculateDebsecan(self):
         """Calculate all debsecan data."""
-        for release in ('', 'woody', 'sarge', 'etch'):
+        for release in ('', 'woody', 'sarge', 'etch', 'lenny'):
             self.calculateDebsecan0(release)
         self.calculateDebsecan1()