From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 27 Oct 2009 09:05:51 +0000 (+0100)
Subject: Merge commit 'mhy/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0a77b3e40ef9bcc95555fb9a791023efa3777261;hp=6a0d15c7c9e06d4c310c2376863a9b5b7edee7ca;p=dak.git

Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  fix p-u accepts for binary uploads

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index fafff7ba..cabdbf3f 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -224,7 +224,10 @@ def package_to_suite(u, suite):
         q = q.join(DBSource).filter_by(source=u.pkg.changes['source'])
         q = q.filter_by(version=u.pkg.changes['version']).limit(1)
 
-        if q.count() < 1:
+        # NB: Careful, this logic isn't what you would think it is
+        # Source is already in {old-,}proposed-updates so no need to hold
+        # Instead, we don't move to the holding area, we just do an ACCEPT
+        if q.count() > 0:
             ret = False
 
         s.close()