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

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
old mode 100755
new mode 100644
index 7add55ff..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
 
 ################################################################################
@@ -448,30 +447,30 @@ class BuildQueue(object):
         for f in self.queuefiles:
             if f.fileid is not None and f.fileid == poolfile.file_id or \
                f.poolfile.filename == poolfile_basename:
-                   # In this case, update the QueueFile entry so we
+                   # 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)
                    return f
 
-        # Prepare QueueFile object
-        qf = QueueFile()
-        qf.queue_id = self.queue_id
+        # Prepare BuildQueueFile object
+        qf = BuildQueueFile()
+        qf.build_queue_id = self.queue_id
         qf.lastused = datetime.now()
-        qf.filename = dest
+        qf.filename = poolfile_basename
 
-        targetpath = qf.fullpath
+        targetpath = poolfile.fullpath
         queuepath = os.path.join(self.path, poolfile_basename)
 
         try:
-            if self.copy_pool_files:
+            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
@@ -485,9 +484,9 @@ class BuildQueue(object):
 __all__.append('BuildQueue')
 
 @session_wrapper
-def get_queue(queuename, session=None):
+def get_build_queue(queuename, session=None):
     """
-    Returns Queue object for given C{queue name}, creating it if it does not
+    Returns BuildQueue object for given C{queue name}, creating it if it does not
     exist.
 
     @type queuename: string
@@ -497,18 +496,18 @@ def get_queue(queuename, session=None):
     @param session: Optional SQLA session object (a temporary one will be
     generated if not supplied)
 
-    @rtype: Queue
-    @return: Queue object for the given queue
+    @rtype: BuildQueue
+    @return: BuildQueue object for the given queue
     """
 
-    q = session.query(Queue).filter_by(queue_name=queuename)
+    q = session.query(BuildQueue).filter_by(queue_name=queuename)
 
     try:
         return q.one()
     except NoResultFound:
         return None
 
-__all__.append('get_queue')
+__all__.append('get_build_queue')
 
 ################################################################################
 
@@ -1659,6 +1658,31 @@ class PolicyQueue(object):
 
 __all__.append('PolicyQueue')
 
+@session_wrapper
+def get_policy_queue(queuename, session=None):
+    """
+    Returns PolicyQueue object for given C{queue name}
+
+    @type queuename: string
+    @param queuename: The name of the queue
+
+    @type session: Session
+    @param session: Optional SQLA session object (a temporary one will be
+    generated if not supplied)
+
+    @rtype: PolicyQueue
+    @return: PolicyQueue object for the given queue
+    """
+
+    q = session.query(PolicyQueue).filter_by(queue_name=queuename)
+
+    try:
+        return q.one()
+    except NoResultFound:
+        return None
+
+__all__.append('get_policy_queue')
+
 ################################################################################
 
 class Priority(object):
@@ -1965,6 +1989,7 @@ __all__.append('get_source_in_suite')
 def add_dsc_to_db(u, filename, session=None):
     entry = u.pkg.files[filename]
     source = DBSource()
+    pfs = []
 
     source.source = u.pkg.dsc["source"]
     source.version = u.pkg.dsc["version"] # NB: not files[file]["version"], that has no epoch
@@ -1983,6 +2008,7 @@ def add_dsc_to_db(u, filename, session=None):
         filename = entry["pool name"] + filename
         poolfile = add_poolfile(filename, entry, dsc_location_id, session)
         session.flush()
+        pfs.append(poolfile)
         entry["files id"] = poolfile.file_id
 
     source.poolfile_id = entry["files id"]
@@ -2026,6 +2052,7 @@ def add_dsc_to_db(u, filename, session=None):
             # FIXME: needs to check for -1/-2 and or handle exception
             if found and obj is not None:
                 files_id = obj.file_id
+                pfs.append(obj)
 
             # If still not found, add it
             if files_id is None:
@@ -2033,6 +2060,7 @@ def add_dsc_to_db(u, filename, session=None):
                 dentry["sha1sum"] = dfentry["sha1sum"]
                 dentry["sha256sum"] = dfentry["sha256sum"]
                 poolfile = add_poolfile(filename, dentry, dsc_location_id, session)
+                pfs.append(poolfile)
                 files_id = poolfile.file_id
 
         df.poolfile_id = files_id
@@ -2062,7 +2090,7 @@ def add_dsc_to_db(u, filename, session=None):
 
     session.flush()
 
-    return dsc_component, dsc_location_id
+    return dsc_component, dsc_location_id, pfs
 
 __all__.append('add_dsc_to_db')
 
@@ -2088,13 +2116,14 @@ def add_deb_to_db(u, filename, session=None):
     filename = entry["pool name"] + filename
     fullpath = os.path.join(cnf["Dir::Pool"], filename)
     if not entry.get("location id", None):
-        entry["location id"] = get_location(cnf["Dir::Pool"], entry["component"], utils.where_am_i(), session).location_id
+        entry["location id"] = get_location(cnf["Dir::Pool"], entry["component"], session=session).location_id
 
-    if not entry.get("files id", None):
+    if entry.get("files id", None):
+        poolfile = get_poolfile_by_id(bin.poolfile_id)
+        bin.poolfile_id = entry["files id"]
+    else:
         poolfile = add_poolfile(filename, entry, entry["location id"], session)
-        entry["files id"] = poolfile.file_id
-
-    bin.poolfile_id = entry["files id"]
+        bin.poolfile_id = entry["files id"] = poolfile.file_id
 
     # Find source id
     bin_sources = get_sources_from_name(entry["source package"], entry["source version"], session=session)
@@ -2125,6 +2154,8 @@ def add_deb_to_db(u, filename, session=None):
     #    session.rollback()
     #    raise MissingContents, "No contents stored for package %s, and couldn't determine contents of %s" % (bin.package, filename)
 
+    return poolfile
+
 __all__.append('add_deb_to_db')
 
 ################################################################################
@@ -2470,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)