Merge remote-tracking branch 'jcristau/cs-set-log-suite'

[dak.git] / dak / control_suite.py

diff --git a/dak/control_suite.py b/dak/control_suite.py
index fecd76405148e1c22a2beded10d1f1d267c52bbc..c94fc1366e7c386cdd1195f3075f78ffc530a1fe 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -251,7 +251,7 @@ def set_suite(file, suite, transaction, britney=False, force=False):
             else:
                 transaction.copy_binary(pkg, suite, component)
 
-            Logger.log(["added", " ".join(key)])
+            Logger.log(["added", suite.suite_name, " ".join(key)])
 
     # Check to see which packages need removed and remove them
     for key, pkid in current.iteritems():
@@ -261,7 +261,7 @@ def set_suite(file, suite, transaction, britney=False, force=False):
                 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", " ".join(key), pkid])
+            Logger.log(["removed", suite.suite_name, " ".join(key), pkid])
 
     session.commit()
 
@@ -445,9 +445,9 @@ def main ():
 
             if action == "set" and not suite.allowcsset:
                 if force:
-                    utils.warn("Would not normally allow setting suite {0} (allowsetcs is FALSE), but --force used".format(suite_name))
+                    utils.warn("Would not normally allow setting suite {0} (allowcsset is FALSE), but --force used".format(suite_name))
                 else:
-                    utils.fubar("Will not reset suite {0} due to its database configuration (allowsetcs is FALSE)".format(suite_name))
+                    utils.fubar("Will not reset suite {0} due to its database configuration (allowcsset is FALSE)".format(suite_name))
 
             if file_list:
                 for f in file_list: