merge from ftp-master

[dak.git] / dak / process_upload.py

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 10e81f6f6200c787d113f5e07e5ae0758dc87fa3..4d1cbc2f6677da8d5ae58fe4c05ea2beef6b97f6 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -258,7 +258,7 @@ def action(u, session):
             for s in u.pkg.changes["distribution"].keys():
                 suite = get_suite(s, session)
                 if suite.policy_queue:
-                    if not chg or chg.approved_for_id != su.policy_queue.policy_queue_id:
+                    if not chg or chg.approved_for_id != suite.policy_queue.policy_queue_id:
                         # This routine will check whether the upload is a binary
                         # upload when the source is already in the target suite.  If
                         # so, we skip the policy queue, otherwise we go there.
@@ -293,6 +293,7 @@ def action(u, session):
     elif answer == 'A':
         if not chg:
             chg = u.pkg.add_known_changes(holding.holding_dir, session=session)
+        session.commit()
         u.accept(summary, short_summary, session)
         u.check_override()
         chg.clean_from_queue()
@@ -312,6 +313,7 @@ def action(u, session):
         u.remove()
     elif answer == 'Q':
         byebye()
+        sys.exit(0)
 
     session.commit()