X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fprocess_new.py;h=e3388d25597654893125d0b55ee957621706c4e2;hb=c63e71b31aeb14ee4f817e519fdcf243e2733504;hp=d631b53aa7b90f67b6dd4d4537e4063efde90c82;hpb=87bf163d12ec8328d87e1b2a2ca2239221a73bd6;p=dak.git

diff --git a/dak/process_new.py b/dak/process_new.py
index d631b53a..e3388d25 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -101,7 +101,7 @@ def recheck():
                 source_epochless_version = re_no_epoch.sub('', source_version)
                 dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version)
                 found = 0
-                for q in ["Accepted", "Embargoed", "Unembargoed"]:
+                for q in ["Accepted", "Embargoed", "Unembargoed", "Newstage"]:
                     if Cnf.has_key("Dir::Queue::%s" % (q)):
                         if os.path.exists(Cnf["Dir::Queue::%s" % (q)] + '/' + dsc_filename):
                             found = 1
@@ -811,9 +811,14 @@ def do_byhand():
             answer = answer[:1].upper()
 
         if answer == 'A':
-            done = 1
-            for f in byhand:
-                del files[f]
+            try:
+                check_daily_lock()
+                done = 1
+                for f in byhand:
+                    del files[f]
+            except CantGetLockError:
+                print "Hello? Operator! Give me the number for 911!"
+                print "Dinstall in the locked area, cant process packages, come back later"
         elif answer == 'M':
             Upload.do_reject(1, Options["Manual-Reject"])
             os.unlink(Upload.pkg.changes_file[:-8]+".dak")
@@ -927,6 +932,10 @@ def do_accept_stableupdate(suite, q):
             # pretty soon.
             print "Binary-only upload, source in new."
             move_to_holding(suite, queue_dir)
+        elif is_source_in_queue_dir(Cnf["Dir::Queue::Newstage"]):
+            # It's in newstage.  Accept into the holding area
+            print "Binary-only upload, source in newstage."
+            move_to_holding(suite, queue_dir)
         else:
             # No case applicable.  Bail out.  Return will cause the upload
             # to be skipped.
@@ -981,13 +990,6 @@ def do_pkg(changes_file):
     Upload.update_subst()
     files = Upload.pkg.files
 
-    try:
-        check_daily_lock()
-    except CantGetLockError:
-        print "Hello? Operator! Give me the number for 911!"
-        print "Dinstall in the locked area, cant process packages, come back later"
-        sys.exit(1)
-
     try:
         with lock_package(Upload.pkg.changes["source"]):
             if not recheck():
@@ -1002,7 +1004,12 @@ def do_pkg(changes_file):
                 (new, byhand) = check_status(files)
 
             if not new and not byhand:
-                do_accept()
+                try:
+                    check_daily_lock()
+                    do_accept()
+                except CantGetLockError:
+                    print "Hello? Operator! Give me the number for 911!"
+                    print "Dinstall in the locked area, cant process packages, come back later"
     except AlreadyLockedError, e:
         print "Seems to be locked by %s already, skipping..." % (e)