queue_id -> policy_queue_id

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/dak/process_upload.py b/dak/process_upload.py
index c1c432094334df73cc652c6b509c955b966b5f59..e48b54e26537c6c3b65ed5f59a5fa42834d04d8d 100755 (executable)
--- 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 9767a5e2dee291eed50ac82873122b172eed1ce1..c048f9ef94d7aab6147f1786f4da30fb60241413 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 = 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()