Make policy queues work and remove print debugging

[dak.git] / daklib / changesutils.py

diff --git a/daklib/changesutils.py b/daklib/changesutils.py
index 6099b489f50ed204d41ff9b6d6e109b1280d864e..0aca121a9f3ec24e03f74ea5a978b733785c2147 100644 (file)
--- a/daklib/changesutils.py
+++ b/daklib/changesutils.py
@@ -149,8 +149,12 @@ def changes_to_queue(upload, srcqueue, destqueue, session):
     """Move a changes file to a different queue and mark as approved for the
        source queue"""
 
-    chg = session.query(DBChange).filter_by(changesname=os.path.basename(upload.pkg.changes_file)).one()
-    chg.approved_for = srcqueue.policy_queue_id
+    try:
+        chg = session.query(DBChange).filter_by(changesname=os.path.basename(upload.pkg.changes_file)).one()
+    except NoResultFound:
+        return False
+
+    chg.approved_for_id = srcqueue.policy_queue_id
 
     for f in chg.files:
         # update the changes_pending_files row
@@ -161,6 +165,8 @@ def changes_to_queue(upload, srcqueue, destqueue, session):
     chg.in_queue = destqueue
     session.commit()
 
+    return True
+
 __all__.append('changes_to_queue')
 
 def new_accept(upload, dry_run, session):