X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=54c2b48704c8275ac7a7cde283eedafaac3ef159;hb=d42c8f0b1d47d3266c734fcd396ca7d1c528e3be;hp=9ffbd6704ec7ad66099df473b5267979d232750e;hpb=f56058049885c86071f354d70d69959de8a4cd53;p=dak.git

diff --git a/dak/process_new.py b/dak/process_new.py
index 9ffbd670..54c2b487 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -92,7 +92,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 +116,7 @@ def recheck():
         elif answer == 'S':
             return 0
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
     return 1
@@ -256,7 +257,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 +467,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 +569,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 +624,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 +675,7 @@ def do_new():
         elif answer == 'S':
             done = 1
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
 ################################################################################
@@ -768,6 +772,7 @@ def do_byhand():
         elif answer == 'S':
             done = 1
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
 ################################################################################