X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=4216a2ab44f68adb6d6eaa39c8ebd8475c93308c;hb=3d385cb82f5b4957e74c4b708d096ce7a8d7671c;hp=3504ed30c8c22948170c724344b935c4cdbc76d8;hpb=bc5df21e92f0791f1967d77b1baf66966c66f7cd;p=dak.git 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()