X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=4216a2ab44f68adb6d6eaa39c8ebd8475c93308c;hb=600cebaebfe47fd91d74345fc3f377a2dcc0b590;hp=57e43da6ac0b77418c8b4745d4c900ef9c4c8728;hpb=1c2f5f4048b36efb345a3aa96b20d60dc7af1990;p=dak.git

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 57e43da6..4216a2ab 100755
--- 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]
 
@@ -216,32 +215,31 @@ def set_suite(file, suite, session, britney=False, force=False):
                              FROM binaries b, bin_associations ba, architecture a
                             WHERE ba.suite = :suiteid
                               AND ba.bin = b.id AND b.architecture = a.id""", {'suiteid': suite_id})
-    for i in q.fetchall():
-        key = " ".join(i[:3])
+    for i in q:
+        key = i[:3]
         current[key] = i[3]
 
-    q = session.execute("""SELECT s.source, s.version, sa.id
+    q = session.execute("""SELECT s.source, s.version, 'source', sa.id
                              FROM source s, src_associations sa
                             WHERE sa.suite = :suiteid
                               AND sa.source = s.id""", {'suiteid': suite_id})
-    for i in q.fetchall():
-        key = " ".join(i[:2]) + " source"
-        current[key] = i[2]
+    for i in q:
+        key = i[:3]
+        current[key] = i[3]
 
     # Build up a dictionary of what should be in the suite
-    desired = {}
+    desired = set()
     for line in lines:
         split_line = line.strip().split()
         if len(split_line) != 3:
             utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1]))
             continue
-        key = " ".join(split_line)
-        desired[key] = ""
+        desired.add(tuple(split_line))
 
     # Check to see which packages need added and add them
-    for key in sorted(desired.keys(), cmp=cmp_package_version):
-        if not current.has_key(key):
-            (package, version, architecture) = key.split()
+    for key in sorted(desired, cmp=cmp_package_version):
+        if key not in current:
+            (package, version, architecture) = key
             version_checks(package, architecture, suite.suite_name, version, session, force)
             pkid = get_id (package, version, architecture, session)
             if not pkid:
@@ -252,18 +250,17 @@ def set_suite(file, suite, session, britney=False, force=False):
             else:
                 session.execute("""INSERT INTO bin_associations (suite, bin)
                                         VALUES (:suiteid, :pkid)""", {'suiteid': suite_id, 'pkid': pkid})
-            Logger.log(["added", key, pkid])
+            Logger.log(["added", " ".join(key), pkid])
 
     # Check to see which packages need removed and remove them
-    for key in current.keys():
-        if not desired.has_key(key):
-            (package, version, architecture) = key.split()
-            pkid = current[key]
+    for key, pkid in current.iteritems():
+        if key not in desired:
+            (package, version, architecture) = key
             if architecture == "source":
                 session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': pkid})
             else:
                 session.execute("""DELETE FROM bin_associations WHERE id = :pkid""", {'pkid': pkid})
-            Logger.log(["removed", key, pkid])
+            Logger.log(["removed", " ".join(key), pkid])
 
     session.commit()
 
@@ -320,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
@@ -346,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()
 
@@ -421,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