[dak/master] clean the pending table even when we quit
Signed-off-by: Mark Hymers <mhy@debian.org>
---
dak/process_upload.py | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/dak/process_upload.py b/dak/process_upload.py
index 33fff0d..10e81f6 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()
###############################################################################
--
1.6.3.3
Reply to: