process-upload: try to use the same session all over the code

[dak.git] / dak / process_upload.py

diff --git a/dak/process_upload.py b/dak/process_upload.py
index e3a19ac31609a3b866e09694e3d44660a6b05b7d..cf1594a3098ba0d164e10b10b7cad49290fbeb23 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -166,6 +166,7 @@ def usage (exit_code=0):
 
 def action(u):
     cnf = Config()
+    holding = Holding()
 
     # changes["distribution"] may not exist in corner cases
     # (e.g. unreadable changes files)
@@ -216,23 +217,32 @@ def action(u):
             answer = m.group(1)
         answer = answer[:1].upper()
 
+    session = DBConn().session()
+
     if answer == 'R':
         os.chdir(u.pkg.directory)
         u.do_reject(0, pi)
     elif answer == 'A':
-        u.pkg.add_known_changes( "Accepted" )
-        u.accept(summary, short_summary)
+        u.pkg.add_known_changes(holding.holding_dir, session)
+        u.accept(summary, short_summary, session)
         u.check_override()
         u.remove()
     elif answer == queuekey:
-        u.pkg.add_known_changes( qu )
-        QueueInfo[qu]["process"](u, summary, short_summary)
+        u.pkg.add_known_changes(holding.holding_dir, session)
+        QueueInfo[qu]["process"](u, summary, short_summary, session)
         u.remove()
     elif answer == 'Q':
         sys.exit(0)
 
+    session.commit()
+
 ###############################################################################
 
+def cleanup():
+    h = Holding()
+    if not Options["No-Action"]:
+        h.clean()
+
 def process_it(changes_file):
     global Logger
 
@@ -302,12 +312,14 @@ def process_it(changes_file):
         action(u)
 
     except (SystemExit, KeyboardInterrupt):
+        cleanup()
         raise
 
     except:
         print "ERROR"
         traceback.print_exc(file=sys.stderr)
 
+    cleanup()
     # Restore previous WD
     os.chdir(u.prevdir)