Merge remote-tracking branch 'drkranz/fixes' into merge

* drkranz/fixes:
  ad348f8d has been superseded by 3daf09a3
  rrd-release-freeze-dates: drop obsolete dates
  rrd-release-freeze-dates: add wheezy release date
  upload.source can be null, fall back to upload.changes
  update-db: display descriptions before deploying update modules
  update-db: automatically find the schema nunmber to upgrade to

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index a849f36db0477323d4f7f524aecd252b6dbd0215..6a1bf84e2dee455f163c6be24ab6738c72d4fa52 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -178,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