Merge remote branch 'bdefreese/barry_update25' into merge

[dak.git] / dak / process_new.py

diff --git a/dak/process_new.py b/dak/process_new.py
index ee5d61cf004dc6d67b5081546ace585685f0a4ba..6bdd301f23512345c0b485f3c2241302ed3a0a1c 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -603,6 +603,9 @@ def do_new(upload, session):
     changes = upload.pkg.changes
     cnf = Config()
 
+    # Check for a valid distribution
+    upload.check_distributions()
+
     # Make a copy of distribution we can happily trample on
     changes["suite"] = copy.copy(changes["distribution"])
 
@@ -620,10 +623,6 @@ def do_new(upload, session):
                         oinv, suite, ninv, override)
             del changes["suite"][suite]
             changes["suite"][override] = 1
-    # Validate suites
-    for suite in changes["suite"].keys():
-        if get_suite(suite, session) is None:
-            utils.fubar("%s has invalid suite '%s' (possibly overriden).  say wha?" % (changes, suite))
 
     # The main NEW processing loop
     done = 0
@@ -676,11 +675,11 @@ def do_new(upload, session):
         elif answer == 'E' and not Options["Trainee"]:
             new = edit_overrides (new, upload, session)
         elif answer == 'M' and not Options["Trainee"]:
-            upload.pkg.remove_known_changes()
             aborted = upload.do_reject(manual=1,
                                        reject_message=Options["Manual-Reject"],
                                        note=get_new_comments(changes.get("source", ""), session=session))
             if not aborted:
+                upload.pkg.remove_known_changes()
                 Logger.log(["NEW REJECT: %s" % (upload.pkg.changes_file)])
                 done = 1
         elif answer == 'N':
@@ -909,17 +908,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:
-                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"
+                # 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: