Merge remote-tracking branch 'origin/master'

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

diff --git a/dak/process_new.py b/dak/process_new.py
index 92104435ae1552ab4bd529f640a92e0cd3884e3a..f33b53bace1e1d570ef544baaf72c2013335d375 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -126,6 +126,7 @@ def takenover_binaries(upload, missing, session):
         if m['type'] != 'dsc':
             binaries.remove(m['package'])
     if binaries:
+        source = upload.binaries[0].source.source
         suite = upload.target_suite.overridesuite or \
                     upload.target_suite.suite_name
         suites = [s[0] for s in session.query(Suite.suite_name).filter \
@@ -134,7 +135,7 @@ def takenover_binaries(upload, missing, session):
         rows = session.query(DBSource.source, DBBinary.package).distinct(). \
                              filter(DBBinary.package.in_(binaries)). \
                              join(DBBinary.source). \
-                             filter(DBSource.source != upload.source.source). \
+                             filter(DBSource.source != source). \
                              join(DBBinary.suites). \
                              filter(Suite.suite_name.in_(suites)). \
                              order_by(DBSource.source, DBBinary.package).all()

diff --git a/dak/update_db.py b/dak/update_db.py
index 4ac0c5db382e9804f5598f1affc6c78dfa2a5a97..5bbc40c5e80f0282cbc7456546667be6087dadfe 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -37,6 +37,8 @@ import os
 import apt_pkg
 import time
 import errno
+from glob import glob
+from re import findall
 
 from daklib import utils
 from daklib.config import Config
@@ -46,7 +48,6 @@ from daklib.daklog import Logger
 ################################################################################
 
 Cnf = None
-required_database_schema = 97
 
 ################################################################################
 
@@ -120,6 +121,7 @@ Updates dak's database schema to the lastest version. You should disable crontab
         print "Determining dak database revision ..."
         cnf = Config()
         logger = Logger('update-db')
+        modules = []
 
         try:
             # Build a connect string
@@ -155,25 +157,39 @@ Updates dak's database schema to the lastest version. You should disable crontab
             self.update_db_to_zero()
             database_revision = 0
 
+        dbfiles = glob(os.path.join(os.path.dirname(__file__), 'dakdb/update*.py'))
+        required_database_schema = int(max(findall('update(\d+).py', " ".join(dbfiles))))
+
         print "dak database schema at %d" % database_revision
         print "dak version requires schema %d"  % required_database_schema
 
-        if database_revision == required_database_schema:
+        if database_revision < required_database_schema:
+            print "\nUpdates to be applied:"
+            for i in range(database_revision, required_database_schema):
+                i += 1
+                dakdb = __import__("dakdb", globals(), locals(), ['update'+str(i)])
+                update_module = getattr(dakdb, "update"+str(i))
+                print "Update %d: %s" % (i, next(s for s in update_module.__doc__.split("\n") if s))
+                modules.append((update_module, i))
+            prompt = "\nUpdate database? (y/N) "
+            answer = utils.our_raw_input(prompt)
+            if answer.upper() != 'Y':
+                sys.exit(0)
+        else:
             print "no updates required"
             logger.log(["no updates required"])
             sys.exit(0)
 
-        for i in range (database_revision, required_database_schema):
+        for module in modules:
+            (update_module, i) = module
             try:
-                dakdb = __import__("dakdb", globals(), locals(), ['update'+str(i+1)])
-                update_module = getattr(dakdb, "update"+str(i+1))
                 update_module.do_update(self)
-                message = "updated database schema from %d to %d" % (database_revision, i+1)
+                message = "updated database schema from %d to %d" % (database_revision, i)
                 print message
                 logger.log([message])
             except DBUpdateError as e:
                 # Seems the update did not work.
-                print "Was unable to update database schema from %d to %d." % (database_revision, i+1)
+                print "Was unable to update database schema from %d to %d." % (database_revision, i)
                 print "The error message received was %s" % (e)
                 logger.log(["DB Schema upgrade failed"])
                 logger.close()

diff --git a/scripts/debian/rrd-release-freeze-dates b/scripts/debian/rrd-release-freeze-dates
index 457e23367ca030cadb21551acb40c8adcf5dfba0..4d1c436310729d2f6bea62011a0d5a4f51c8d0e5 100644 (file)
--- a/scripts/debian/rrd-release-freeze-dates
+++ b/scripts/debian/rrd-release-freeze-dates
@@ -1,4 +1,3 @@
-VRULE:1234691928#632a5b:lenny release
-VRULE:1281102258#0b19c1:squeeze freeze
 VRULE:1296908977#0b19c1:squeeze release
 VRULE:1341078720#00ff00:wheezy freeze
+VRULE:1367689920#00ff00:wheezy release