Merge remote branch 'ansgar/daklog' into merge

[dak.git] / dak / dominate.py

diff --git a/dak/dominate.py b/dak/dominate.py
index 73eee8ca18f5261b95da7f930813b45334abfa53..483ab28ab9e7c0f279f9fad6ac0b6ad7db5f3d6f 100755 (executable)
--- a/dak/dominate.py
+++ b/dak/dominate.py
@@ -35,10 +35,11 @@ def fetch(reason, query, args, session):
     for row in session.execute(query, args).fetchall():
         (id, package, version, suite_name, architecture) = row
         if Options['No-Action']:
-            print "Delete %s %s from %s architecture %s (%s)" % \
-                (package, version, suite_name, architecture, reason)
+            print "Delete %s %s from %s architecture %s (%s, %d)" % \
+                (package, version, suite_name, architecture, reason, id)
         else:
-            Logger.log([reason, package, version, suite_name, architecture])
+            Logger.log([reason, package, version, suite_name, \
+               architecture, id])
         idList.append(id)
     return idList
 
@@ -135,7 +136,7 @@ def main():
     Options = cnf.SubTree("Obsolete::Options")
     if Options['Help']:
         usage()
-    Logger = daklog.Logger(cnf.Cnf, "dominate")
+    Logger = daklog.Logger("dominate")
     session = DBConn().session()
     for suite_name in utils.split_args(Options['Suite']):
         suite = session.query(Suite).filter_by(suite_name = suite_name).one()