[Blends-commit] [SCM] website branch, master, updated. a8d8c879b568b73f45559df2ba28ba4213ee7e34

[Andreas Tille]

The following commit has been merged in the master branch:
commit 451dec54d7a915ec7f29fe0c9f1b7ecb1e70d9b7
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 6 09:29:48 2015 +0200

    Fix release names

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 4d288f6..6b3a0bb 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -78,9 +78,10 @@ SUGGESTED  = 1
 DONE       = 2
 BUGLISTCAT = (DEPENDENT, SUGGESTED, DONE )
 
-releases  = {'oldstable'    : ('etch', 'etch-proposed-updates', 'etch-security'),
-             'stable'       : ('lenny', 'lenny-proposed-updates', 'lenny-security'),
-             'testing'      : ('squeeze'),
+# FIXME: Obtain releases from UDD table releases (is this used at all???)
+releases  = {'oldstable'    : ('wheezy', 'wheezy-proposed-updates', 'wheezy-security'),
+             'stable'       : ('jessie', 'jessie-proposed-updates', 'jessie-security'),
+             'testing'      : ('stretch'),
              'unstable'     : ('sid'),
              'experimental' : ('experimental')
             }
@@ -480,7 +481,7 @@ query = """PREPARE pkg_versions_stable_testing (text) AS
    SELECT release,  regexp_replace(regexp_replace(debversion, '-.*', ''), '[.+~]dfsg.*', '') AS version, debversion
      FROM (SELECT r AS release, MAX(version) AS debversion
              FROM versions_archs_component($1) AS (r text, version text, archs text, component text)
-            WHERE r IN ('lenny', 'squeeze') GROUP BY r) AS zw;"""  # Change here releases once Squeeze is released
+            WHERE r IN ('jessie', 'stretch') GROUP BY r) AS zw;"""  # FIXME: Do not hardcode names here!!!
 _execute_udd_query(query)
 
 # Number of all submissions

-- 
Static and dynamic websites for Debian Pure Blends