Make process_new check if a directory is defined in config before trying to use it

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index 52d41bce69093754b36edfdcfd06bc522c4754a4..0ae5307341d9c499db326a045d6541815415497b 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -85,10 +85,11 @@ def recheck():
                 dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version)
                found = 0
                for q in ["Accepted", "Embargoed", "Unembargoed"]:
-                    if os.path.exists(Cnf["Dir::Queue::%s" % (q)] + '/' + dsc_filename):
-                       found = 1
+            if Cnf.has_key(Cnf["Dir::Queue::%s" % (q)]):
+                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))
+            reject("no source found for %s %s (%s)." % (source_package, source_version, file))
 
         # Version and file overwrite checks
         if files[file]["type"] == "deb":
@@ -120,6 +121,7 @@ def recheck():
         elif answer == 'S':
             return 0
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
     return 1
@@ -470,6 +472,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"])
@@ -571,6 +574,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>" % (
@@ -676,6 +680,7 @@ def do_new():
         elif answer == 'S':
             done = 1
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
 ################################################################################
@@ -772,6 +777,7 @@ def do_byhand():
         elif answer == 'S':
             done = 1
         elif answer == 'Q':
+            end()
             sys.exit(0)
 
 ################################################################################
@@ -811,7 +817,7 @@ def do_accept():
            # Check for override disparities
            Upload.Subst["__SUMMARY__"] = summary
        else:
-            Upload.accept(summary, short_summary)
+        Upload.accept(summary, short_summary)
         os.unlink(Upload.pkg.changes_file[:-8]+".dak")
        os.unlink(Cnf["Process-New::AcceptedLockFile"])