Merge remote branch 'origin/master' into contents

[dak.git] / daklib / queue_install.py

diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index b4a38b96e4488ff697745bcf86382b9ee9ce27c0..3283e1eff7591bb6ccfcd058b005198f82d9cca4 100644 (file)
--- 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_id = queue.policy_queue_id
     session.add(chg)
     session.commit()
 
@@ -209,7 +209,7 @@ def is_byhand(u):
 
 def do_byhand(u, summary, short_summary, chg, session):
     return package_to_queue(u, summary, short_summary,
-                            get_queue('byhand'), chg, session,
+                            get_policy_queue('byhand'), chg, session,
                             announce=None)
 
 ################################################################################
@@ -226,10 +226,10 @@ def acknowledge_new(u, summary, short_summary, chg, session):
     print "Moving to NEW queue."
     u.logger.log(["Moving to new", u.pkg.changes_file])
 
-    q = get_queue('new', session)
+    q = get_policy_queue('new', session)
 
     u.move_to_queue(q)
-    chg.in_queue = q.queue_id
+    chg.in_queue_id = q.policy_queue_id
     session.add(chg)
     session.commit()