From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 10 Mar 2012 11:53:23 +0000 (+0100)
Subject: Merge branch 'master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0b6283c9607d6c0e28a35d74089fc81d7b3f91cd;hp=18405d5895036334ecc86a6db6f2eb22dbdc798a;p=dak.git

Merge branch 'master' into merge

* master:
  log suitename only

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/control_suite.py b/dak/control_suite.py
index 3504ed30..4216a2ab 100755
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -317,7 +317,7 @@ 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, pkid])
+                    Logger.log(["added", package, version, architecture, suite.suite_name, pkid])
 
             elif action == "remove":
                 if association_id == None:
@@ -325,7 +325,7 @@ def process_file(file, suite, action, session, britney=False, force=False):
                     continue
                 else:
                     session.execute("""DELETE FROM src_associations WHERE id = :pkid""", {'pkid': association_id})
-                    Logger.log(["removed", package, version, architecture, suite, pkid])
+                    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,14 +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, 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, pkid])
+                    Logger.log(["removed", package, version, architecture, suite.suite_name, pkid])
 
     session.commit()