X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_upload.py;h=10e81f6f6200c787d113f5e07e5ae0758dc87fa3;hb=0cafe517c049fffc664411df962c96da99c66ea5;hp=33fff0dc8059af7834b94619b8c402cccc2e31e2;hpb=a59141de00876ae28f067141b99d295da3ff934b;p=dak.git

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 33fff0dc..10e81f6f 100755
--- 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()
@@ -302,7 +311,7 @@ def action(u, session):
         session.commit()
         u.remove()
     elif answer == 'Q':
-        sys.exit(0)
+        byebye()
 
     session.commit()
 
@@ -482,14 +491,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()
 
 ###############################################################################