X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=8da26063607d7d501b224162fb1630118b48a5ff;hb=80cfee07dd22dc9190eb05237db26a8e1514e1c6;hp=9c25f67014562c8b1453f08b2577b670e99978ba;hpb=9d4e45eb9a3f847f00f3b09d85d7b7ed46529ba9;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 9c25f670..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()
@@ -3219,7 +3219,6 @@ class DBConn(object):
             'almost_obsolete_all_associations',
             'almost_obsolete_src_associations',
             'any_associations_source',
-            'bin_assoc_by_arch',
             'bin_associations_binaries',
             'binaries_suite_arch',
             'binfiles_suite_component_arch',