X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=fd8ab7caa9f467c19c70026184d49c5f7dfad892;hb=2ea80bc54c5a10983fdb59b210b9db853a008f94;hp=4ba23b6222ddd1d048113eb554fab66c9fcf268d;hpb=155484bc9688e07f75704941f57ba037084d053b;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
old mode 100755
new mode 100644
index 4ba23b62..fd8ab7ca
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -51,7 +51,6 @@ from sqlalchemy.exc import *
 from sqlalchemy.orm.exc import NoResultFound
 
 from config import Config
-from singleton import Singleton
 from textutils import fix_maintainer
 
 ################################################################################
@@ -456,7 +455,7 @@ class BuildQueue(object):
 
         # Prepare BuildQueueFile object
         qf = BuildQueueFile()
-        qf.queue_id = self.queue_id
+        qf.build_queue_id = self.queue_id
         qf.lastused = datetime.now()
         qf.filename = poolfile_basename
 
@@ -467,11 +466,11 @@ class BuildQueue(object):
             if self.copy_files:
                 # We need to copy instead of symlink
                 import utils
-                utils.copy(targetfile, queuepath)
+                utils.copy(targetpath, queuepath)
                 # NULL in the fileid field implies a copy
                 qf.fileid = None
             else:
-                os.symlink(targetfile, queuepath)
+                os.symlink(targetpath, queuepath)
                 qf.fileid = poolfile.file_id
         except OSError:
             return None
@@ -2502,18 +2501,19 @@ __all__.append('UploadBlock')
 
 ################################################################################
 
-class DBConn(Singleton):
+class DBConn(object):
     """
     database module init.
     """
+    __shared_state = {}
+
     def __init__(self, *args, **kwargs):
-        super(DBConn, self).__init__(*args, **kwargs)
+        self.__dict__ = self.__shared_state
 
-    def _startup(self, *args, **kwargs):
-        self.debug = False
-        if kwargs.has_key('debug'):
-            self.debug = True
-        self.__createconn()
+        if not getattr(self, 'initialised', False):
+            self.initialised = True
+            self.debug = kwargs.has_key('debug')
+            self.__createconn()
 
     def __setuptables(self):
         self.tbl_architecture = Table('architecture', self.db_meta, autoload=True)