From: Ansgar Burchardt <ansgar@debian.org>
Date: Sat, 26 Mar 2011 15:19:41 +0000 (+0000)
Subject: daklib/dbconn.py: f.poolfile might be None
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=78a9ce0b01a9d64e297bba87ad98219ce429b3b7;p=dak.git

daklib/dbconn.py: f.poolfile might be None

Signed-off-by: Ansgar Burchardt <ansgar@debian.org>
---

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 6948cf6c..8da26063 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -856,8 +856,8 @@ class BuildQueue(object):
 
         # Check if we have a file of this name or this ID already
         for f in self.queuefiles:
-            if f.fileid is not None and f.fileid == poolfile.file_id or \
-               f.poolfile.filename == poolfile_basename:
+            if (f.fileid is not None and f.fileid == poolfile.file_id) or \
+               (f.poolfile is not None and f.poolfile.filename == poolfile_basename):
                    # In this case, update the BuildQueueFile entry so we
                    # don't remove it too early
                    f.lastused = datetime.now()