config/debian/dak.conf, dak/transitions.py:

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 1c69fd9e3992507f90e1662d3117b4d540ac0d0d..4b2cff3ea157c8cc8f8b44b60b23d221b6ba68aa 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -666,6 +666,7 @@ def do_new(upload, session):
             try:
                 check_daily_lock()
                 done = add_overrides (new, upload, session)
+                do_accept(upload, session)
                 Logger.log(["NEW ACCEPT: %s" % (upload.pkg.changes_file)])
             except CantGetLockError:
                 print "Hello? Operator! Give me the number for 911!"
@@ -837,8 +838,6 @@ def changes_to_newstage(upload, session):
     new = get_policy_queue('new', session );
     newstage = get_policy_queue('newstage', session );
 
-    # changes.in_queue = newstage
-
     chg = session.query(DBChange).filter_by(changesname=os.path.basename(upload.pkg.changes_file)).one()
     chg.approved_for = newstage.policy_queue_id
 
@@ -849,6 +848,7 @@ def changes_to_newstage(upload, session):
 
     utils.move(os.path.join(new.path, upload.pkg.changes_file), newstage.path, perms=int(newstage.perms, 8))
     chg.in_queue = newstage
+    session.commit()
 
 def _accept(upload, session):
     if Options["No-Action"]:
@@ -909,12 +909,17 @@ def do_pkg(changes_file, session):
                 if not recheck(u, session):
                     return
 
-            # FIXME: This does need byhand checks added!
-            new = determine_new(u.pkg.changes, files)
-            if new:
-                do_new(u, session)
-            else:
-                do_accept(u, session)
+                # FIXME: This does need byhand checks added!
+                new = determine_new(u.pkg.changes, files)
+                if new:
+                    do_new(u, session)
+                else:
+                    try:
+                        check_daily_lock()
+                        do_accept(u, session)
+                    except CantGetLockError:
+                        print "Hello? Operator! Give me the number for 911!"
+                        print "Dinstall in the locked area, cant process packages, come back later"
 #             (new, byhand) = check_status(files)
 #             if new or byhand:
 #                 if new: