Re-enable source-contains-waf-binary now that #661561 is fixed.

[dak.git] / dak / control_suite.py

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 236e36aa4cfbd005679f5f22f6f21a6de7d5d429..4216a2ab44f68adb6d6eaa39c8ebd8475c93308c 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -122,7 +122,6 @@ def britney_changelog(packages, suite, session):
     for p in q.fetchall():
         current[p[0]] = p[1]
     for p in packages.keys():
-        p = p.split()
         if p[2] == "source":
             old[p[0]] = p[1]
 
@@ -318,12 +317,15 @@ def process_file(file, suite, action, session, britney=False, force=False):
                     session.execute("""INSERT INTO src_associations (suite, source)
                                             VALUES (:suiteid, :pkid)""",
                                        {'suiteid': suite_id, 'pkid': pkid})
+                    Logger.log(["added", package, version, architecture, suite.suite_name, pkid])
+
             elif action == "remove":
                 if association_id == None:
                     utils.warn("'%s_%s_%s' doesn't exist in suite %s." % (package, version, architecture, suite))
                     continue
                 else:
                     session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': association_id})
+                    Logger.log(["removed", package, version, architecture, suite.suite_name, pkid])
         else:
             # Find the existing associations ID, if any
             q = session.execute("""SELECT id FROM bin_associations
@@ -344,12 +346,14 @@ def process_file(file, suite, action, session, britney=False, force=False):
                     session.execute("""INSERT INTO bin_associations (suite, bin)
                                             VALUES (:suiteid, :pkid)""",
                                        {'suiteid': suite_id, 'pkid': pkid})
+                    Logger.log(["added", package, version, architecture, suite.suite_name, pkid])
             elif action == "remove":
                 if association_id == None:
                     utils.warn("'%s_%s_%s' doesn't exist in suite %s." % (package, version, architecture, suite))
                     continue
                 else:
                     session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': association_id})
+                    Logger.log(["removed", package, version, architecture, suite.suite_name, pkid])
 
     session.commit()
 
@@ -419,15 +423,17 @@ def main ():
                     utils.fubar("Can only perform one action at a time.")
                 action = i
 
+                # Safety/Sanity check
+                if action == "set" and (not suite.allowcsset):
+                    if force:
+                        utils.warn("Would not normally allow setting suite %s (allowsetcs is FALSE), but --force used" % (suite_name))
+                    else:
+                        utils.fubar("Will not reset suite %s due to its database configuration (allowsetcs is FALSE)" % (suite_name))
+
     # Need an action...
     if action == None:
         utils.fubar("No action specified.")
 
-    # Safety/Sanity check
-    # XXX: This should be stored in the database
-    if action == "set" and suite_name not in ["testing", "squeeze-updates"]:
-        utils.fubar("Will not reset suite %s" % (suite_name))
-
     britney = False
     if action == "set" and cnf["Control-Suite::Options::Britney"]:
         britney = True