X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=4216a2ab44f68adb6d6eaa39c8ebd8475c93308c;hb=b92562632a64ec38e785278212e43f47c9a0dfef;hp=d18bc70594ac8fd8c03d60978f69953a8f3744b7;hpb=e939620de1f925def64465f20f1f2320f092d967;p=dak.git diff --git a/dak/control_suite.py b/dak/control_suite.py index d18bc705..4216a2ab 100755 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -122,7 +122,6 @@ def britney_changelog(packages, suite, session): for p in q.fetchall(): current[p[0]] = p[1] for p in packages.keys(): - p = p.split() if p[2] == "source": old[p[0]] = p[1] @@ -318,12 +317,15 @@ 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.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 src_associations WHERE id = :pkid""", {'pkid': association_id}) + 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 @@ -344,12 +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.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.suite_name, pkid]) session.commit()