X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=6a1bf84e2dee455f163c6be24ab6738c72d4fa52;hb=b3f49124b42e8798f9abb47a94d4cf85bc9671bf;hp=21eaac9ebed0ad9d21f71ee03a5fa9c5b1c0ece7;hpb=ef5d64e23cd74af46ec19789c81a9bed804009c3;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 21eaac9e..6a1bf84e 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -156,8 +156,10 @@ class ReleaseWriter(object):
             if getattr(suite, dbfield) is not None:
                 # TEMPORARY HACK HACK HACK until we change the way we store the suite names etc
                 if key == 'Suite' and getattr(suite, dbfield) == 'squeeze-updates':
-                    out.write("Suite: stable-updates\n")
+                    out.write("Suite: oldstable-updates\n")
                 elif key == 'Suite' and getattr(suite, dbfield) == 'wheezy-updates':
+                    out.write("Suite: stable-updates\n")
+                elif key == 'Suite' and getattr(suite, dbfield) == 'jessie-updates':
                     out.write("Suite: testing-updates\n")
                 else:
                     out.write("%s: %s\n" % (key, getattr(suite, dbfield)))
@@ -176,7 +178,7 @@ class ReleaseWriter(object):
 
         components = [ c.component_name for c in session.query(Component) ]
 
-        out.write("Components: %s\n" % ( " ".join(map(lambda x: "%s%s" % (suite_suffix, x), components ))))
+        out.write("Components: %s\n" % (" ".join(components)))
 
         # For exact compatibility with old g-r, write out Description here instead
         # of with the rest of the DB fields above