From: Mark Hymers Date: Sat, 31 Oct 2009 21:39:31 +0000 (+0000) Subject: queue_id -> policy_queue_id X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6a04540642478715650bd496d522f42f9f6e7434;hp=9fd435d953d9fe70e5831671121f61b6fc728edb;p=dak.git queue_id -> policy_queue_id Signed-off-by: Mark Hymers --- diff --git a/dak/process_upload.py b/dak/process_upload.py index c1c43209..e48b54e2 100755 --- a/dak/process_upload.py +++ b/dak/process_upload.py @@ -292,7 +292,7 @@ def action(u, session): if not chg: chg = u.pkg.add_known_changes(holding.holding_dir, session) u.move_to_queue(policyqueue) - chg.in_queue = policyqueue.queue_id + chg.in_queue = policyqueue.policy_queue_id session.add(chg) session.commit() u.remove() diff --git a/daklib/queue_install.py b/daklib/queue_install.py index 9767a5e2..c048f9ef 100644 --- a/daklib/queue_install.py +++ b/daklib/queue_install.py @@ -61,7 +61,7 @@ def package_to_queue(u, summary, short_summary, queue, chg, session, announce=No u.logger.log(["Moving to %s" % queue.queue_name, u.pkg.changes_file]) u.move_to_queue(queue) - chg.in_queue = queue.queue_id + chg.in_queue = queue.policy_queue_id session.add(chg) session.commit() @@ -229,7 +229,7 @@ def acknowledge_new(u, summary, short_summary, chg, session): q = get_policy_queue('new', session) u.move_to_queue(q) - chg.in_queue = q.queue_id + chg.in_queue = q.policy_queue_id session.add(chg) session.commit()