Merge remote branch 'drkranz/master' into merge

[dak.git] / dak / process_upload.py

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 33fff0dc8059af7834b94619b8c402cccc2e31e2..f408e177e7a15caf69a0a02db625818a503712c9 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -196,6 +196,15 @@ def usage (exit_code=0):
 
 ###############################################################################
 
+def byebye():
+    if not Options["No-Action"]:
+        # Clean out the queue files
+        session = DBConn().session()
+        session.execute("DELETE FROM changes_pending_files WHERE id NOT IN (SELECT file_id FROM changes_pending_files_map )")
+        session.commit()
+
+
+
 def action(u, session):
     cnf = Config()
     holding = Holding()
@@ -284,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()
@@ -302,6 +312,7 @@ def action(u, session):
         session.commit()
         u.remove()
     elif answer == 'Q':
+        byebye()
         sys.exit(0)
 
     session.commit()
@@ -482,14 +493,12 @@ def main():
                                                 utils.size_type(int(summarystats.accept_bytes)))
         Logger.log(["total", summarystats.accept_count, summarystats.accept_bytes])
 
-    if not Options["No-Action"]:
-        # Clean out the queue files
-        session = DBConn().session()
-        session.execute("DELETE FROM changes_pending_files WHERE id NOT IN (SELECT file_id FROM changes_pending_files_map )")
-        session.commit()
+    byebye()
 
+    if not Options["No-Action"]:
         if log_urgency:
             UrgencyLog().close()
+
     Logger.close()
 
 ###############################################################################