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 fafff7baff5060436c87a155a6456ede46a5e642..cabdbf3f6f914738f2ad4bf0a6f14d9bf28578e4 100755 (executable)
--- 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()