Merge branch 'master' into bpo

[dak.git] / dak / control_suite.py

diff --git a/dak/control_suite.py b/dak/control_suite.py
index a2cb9f375976af04cc246ab22c46c6b13e64dd89..d8f8227b2320e4d8302670f4757a180c7a84a26e 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -142,7 +142,7 @@ def set_suite(file, suite, session):
     for key in desired.keys():
         if not current.has_key(key):
             (package, version, architecture) = key.split()
-            pkid = get_id (package, version, architecture)
+            pkid = get_id (package, version, architecture, session)
             if not pkid:
                 continue
             if architecture == "source":
@@ -175,7 +175,7 @@ def process_file(file, suite, action, session):
 
         (package, version, architecture) = split_line
 
-        pkid = get_id(package, version, architecture)
+        pkid = get_id(package, version, architecture, session)
         if not pkid:
             continue
 
@@ -223,7 +223,7 @@ def process_file(file, suite, action, session):
                     continue
                 else:
                     session.execute("""INSERT INTO bin_associations (suite, bin)
-                                            VALUES (%s, %s)""",
+                                            VALUES (:suiteid, :pkid)""",
                                        {'suiteid': suite_id, 'pkid': pkid})
             elif action == "remove":
                 if association_id == None:
@@ -302,7 +302,7 @@ def main ():
 
     # Safety/Sanity check
     # XXX: This should be stored in the database
-    if action == "set" and suite_name not in ["testing", "etch-m68k"]:
+    if action == "set" and suite_name not in ["testing"]:
         utils.fubar("Will not reset suite %s" % (suite_name))
 
     if action == "list":