From: Philipp Kern <pkern@debian.org>
Date: Fri, 8 Aug 2008 15:01:15 +0000 (-0300)
Subject: dak/process_new.py: fix up binary diversion into various queues
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=631a3aece302e6db4b94032570590efff1d7f593;p=dak.git

dak/process_new.py: fix up binary diversion into various queues
---

diff --git a/dak/process_new.py b/dak/process_new.py
index 6b37d699..9ed65cc5 100755
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -846,21 +846,22 @@ def do_accept_stableupdate(suite, q):
         if is_source_in_qdir(queue_dir):
             # It's in p-u holding, so move it there.
             move_to_holding(suite, queue_dir)
-        if is_source_in_qdir(Cnf["Dir::Queue::New"]):
+        elif is_source_in_qdir(Cnf["Dir::Queue::New"]):
             # It's in NEW.  We expect the source to land in p-u holding
             # pretty soon.
             move_to_holding(suite, queue_dir)
-        if is_source_in_qdir(Cnf["Dir::Queue::Accepted"]):
+        elif is_source_in_qdir(Cnf["Dir::Queue::Accepted"]):
             # The source is in accepted, the binary cleared NEW: accept it.
             Upload.accept(summary, short_summary)
             os.unlink(Upload.pkg.changes_file[:-8]+".dak")
-        if Upload.source_exists(Upload.pkg.changes["source"],
+        elif Upload.source_exists(Upload.pkg.changes["source"],
                 Upload.pkg.changes["version"]):
             # dak tells us that there is source available.  At time of
             # writing this means that it is installed, so put it into
             # accepted.
             Upload.accept(summary, short_summary)
             os.unlink(Upload.pkg.changes_file[:-8]+".dak")
+	return
     move_to_holding(suite, queue_dir)
 
 def do_accept():