Merged from ftpmaster

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 9ffbd6704ec7ad66099df473b5267979d232750e..085e0913117277a7ffe72ba86b9c19b04b0ba690 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -83,7 +83,11 @@ def recheck():
                and not Upload.source_exists(source_package, source_version, Upload.pkg.changes["distribution"].keys()):
                 source_epochless_version = daklib.utils.re_no_epoch.sub('', source_version)
                 dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version)
-                if not os.path.exists(Cnf["Dir::Queue::Accepted"] + '/' + dsc_filename):
+               found = 0
+               for q in ["Accepted", "Embargoed", "Unembargoed"]:
+                    if os.path.exists(Cnf["Dir::Queue::%s" % (q)] + '/' + dsc_filename):
+                       found = 1
+               if not found:
                     reject("no source found for %s %s (%s)." % (source_package, source_version, file))
 
         # Version and file overwrite checks
@@ -92,7 +96,7 @@ def recheck():
         elif files[file]["type"] == "dsc":
             reject(Upload.check_source_against_db(file))
             (reject_msg, is_in_incoming) = Upload.check_dsc_against_db(file)
-            reject(reject_msg)
+            reject(reject_msg, "")
 
     if reject_message.find("Rejected") != -1:
         answer = "XXX"
@@ -116,6 +120,7 @@ def recheck():
         elif answer == 'S':
             return 0
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
     return 1
@@ -256,7 +261,7 @@ class Priority_Completer:
 ################################################################################
 
 def print_new (new, indexed, file=sys.stdout):
-    daklib.utils.check_valid(new)
+    daklib.queue.check_valid(new)
     broken = 0
     index = 0
     for pkg in new.keys():
@@ -466,6 +471,7 @@ def edit_note(note):
     if answer == 'A':
         return
     elif answer == 'Q':
+        end()
         sys.exit(0)
     Upload.pkg.changes["process-new note"] = note
     Upload.dump_vars(Cnf["Dir::Queue::New"])
@@ -567,6 +573,7 @@ def prod_maintainer ():
         if answer == 'A':
             return
         elif answer == 'Q':
+            end()
             sys.exit(0)
     # Otherwise, do the proding...
     user_email_address = daklib.utils.whoami() + " <%s>" % (
@@ -621,7 +628,7 @@ def do_new():
     done = 0
     while not done:
         # Find out what's new
-        new = daklib.utils.determine_new(changes, files, projectB)
+        new = daklib.queue.determine_new(changes, files, projectB)
 
         if not new:
             break
@@ -672,6 +679,7 @@ def do_new():
         elif answer == 'S':
             done = 1
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
 ################################################################################
@@ -768,30 +776,47 @@ def do_byhand():
         elif answer == 'S':
             done = 1
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
 ################################################################################
 
+def get_accept_lock():
+    retry = 0
+    while retry < 10:
+        try:
+           lock_fd = os.open(Cnf["Process-New::AcceptedLockFile"], os.O_RDONLY | os.O_CREAT | os.O_EXCL)
+            retry = 10
+       except OSError, e:
+           if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EEXIST':
+               retry += 1
+               if (retry >= 10):
+                   daklib.utils.fubar("Couldn't obtain lock; assuming 'dak process-unchecked' is already running.")
+               else:
+                   print("Unable to get accepted lock (try %d of 10)" % retry)
+               time.sleep(60)
+           else:
+               raise
+
+def move_to_dir (dest, perms=0660, changesperms=0664):
+    daklib.utils.move (Upload.pkg.changes_file, dest, perms=changesperms)
+    file_keys = Upload.pkg.files.keys()
+    for file in file_keys:
+        daklib.utils.move (file, dest, perms=perms)
+
 def do_accept():
     print "ACCEPT"
     if not Options["No-Action"]:
-        retry = 0
-       while retry < 10:
-           try:
-               lock_fd = os.open(Cnf["Process-New::AcceptedLockFile"], os.O_RDONLY | os.O_CREAT | os.O_EXCL)
-                retry = 10
-           except OSError, e:
-               if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EEXIST':
-                   retry += 1
-                   if (retry >= 10):
-                       daklib.utils.fubar("Couldn't obtain lock; assuming 'dak process-unchecked' is already running.")
-                   else:
-                       print("Unable to get accepted lock (try %d of 10)" % retry)
-                   time.sleep(60)
-               else:
-                   raise
+        get_accept_lock()
         (summary, short_summary) = Upload.build_summaries()
-        Upload.accept(summary, short_summary)
+       if Cnf.FindB("Dinstall::SecurityQueueHandling"):
+           Upload.dump_vars(Cnf["Dir::Queue::Embargoed"])
+           move_to_dir(Cnf["Dir::Queue::Embargoed"])
+           Upload.queue_build("embargoed", Cnf["Dir::Queue::Embargoed"])
+           # Check for override disparities
+           Upload.Subst["__SUMMARY__"] = summary
+       else:
+            Upload.accept(summary, short_summary)
         os.unlink(Upload.pkg.changes_file[:-8]+".dak")
        os.unlink(Cnf["Process-New::AcceptedLockFile"])