From: Frank Lichtenheld <djpig@debian.org>
Date: Sat, 31 Oct 2009 14:06:38 +0000 (+0000)
Subject: check_files: Fix check for known changes files
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8553fbdec127c442401908035a7d31c76ef7dca9;p=dak

check_files: Fix check for known changes files

Signed-off-by: Frank Lichtenheld <djpig@debian.org>
---

diff --git a/daklib/queue.py b/daklib/queue.py
index 15a83958..e1ade39e 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -817,7 +817,10 @@ class Upload(object):
 
         try:
             dbc = session.query(DBChange).filter_by(changesname=base_filename).one()
-            if dbc.in_queue is not None and dbc.in_queue.queue_name != 'unchecked':
+            # if in the pool or in a queue other than unchecked, reject
+            if (dbc.in_queue is None) \
+                   or (dbc.in_queue is not None
+                       and dbc.in_queue.queue_name != 'unchecked'):
                 self.rejects.append("%s file already known to dak" % base_filename)
         except NoResultFound, e:
             # not known, good