Merge commit 'ftpmaster/master'

diff --combined daklib/dbconn.py
index 96eacd7b6a3bde2d350224bf202dd8bc6ec40bee,361dcf42cfc3b1eaad30d1f3dbc72785678e8c02..8879185175d6e1123e9acf19dc43f7a62efae89f
--- 1/daklib/dbconn.py
--- 2/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -434,7 -434,7 +434,7 @@@ class BuildQueue(object)
          pass
  
      def __repr__(self):
-         return '<Queue %s>' % self.queue_name
+         return '<BuildQueue %s>' % self.queue_name
  
      def add_file_from_pool(self, poolfile):
          """Copies a file into the pool.  Assumes that the PoolFile object is
@@@ -450,7 -450,7 +450,7 @@@
                     # In this case, update the BuildQueueFile entry so we
                     # don't remove it too early
                     f.lastused = datetime.now()
-                    DBConn().session().object_session(pf).add(f)
+                    DBConn().session().object_session(poolfile).add(f)
                     return f
  
          # Prepare BuildQueueFile object
@@@ -516,7 -516,7 +516,7 @@@ class BuildQueueFile(object)
          pass
  
      def __repr__(self):
 -        return '<BuildQueueFile %s (%s)>' % (self.filename, self.queue_id)
 +        return '<BuildQueueFile %s (%s)>' % (self.filename, self.build_queue_id)
  
  __all__.append('BuildQueueFile')
  
@@@ -2062,6 -2062,11 +2062,11 @@@ def add_dsc_to_db(u, filename, session=
                  poolfile = add_poolfile(filename, dentry, dsc_location_id, session)
                  pfs.append(poolfile)
                  files_id = poolfile.file_id
+         else:
+             poolfile = get_poolfile_by_id(files_id, session)
+             if poolfile is None:
+                 utils.fubar("INTERNAL ERROR. Found no poolfile with id %d" % files_id)
+             pfs.append(poolfile)
  
          df.poolfile_id = files_id
          session.add(df)