X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=6d5497fc2d5f4b096d972631637e284eb2ce00aa;hb=05c002afb12f077d753234de45753062fa54ce02;hp=adecc38a7f060d6c9876be399e6d6b4df3fb3034;hpb=a5f216eb3e4035e726eb0a708a0d9ec944c0061f;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index adecc38a..6d5497fc 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -39,7 +39,7 @@ import traceback
 
 from inspect import getargspec
 
-from sqlalchemy import create_engine, Table, MetaData, select
+from sqlalchemy import create_engine, Table, MetaData
 from sqlalchemy.orm import sessionmaker, mapper, relation
 
 # Don't remove this, we re-export the exceptions to scripts which import us
@@ -84,6 +84,7 @@ def session_wrapper(fn):
                 # Session is last argument in args
                 session = args[-1]
                 if session is None:
+                    args = list(args)
                     session = args[-1] = DBConn().session()
                     private_transaction = True
 
@@ -1417,6 +1418,7 @@ class Queue(object):
             # them (if one doesn't already exist)
             for dsc_file in changes.dsc_files.keys():
                 # Skip all files except orig tarballs
+                from daklib.regexes import re_is_orig_source
                 if not re_is_orig_source.match(dsc_file):
                     continue
                 # Skip orig files not identified in the pool
@@ -1462,9 +1464,10 @@ class Queue(object):
 __all__.append('Queue')
 
 @session_wrapper
-def get_queue(queuename, session=None):
+def get_or_set_queue(queuename, session=None):
     """
-    Returns Queue object for given C{queue name}.
+    Returns Queue object for given C{queue name}, creating it if it does not
+    exist.
 
     @type queuename: string
     @param queuename: The name of the queue
@@ -1480,11 +1483,17 @@ def get_queue(queuename, session=None):
     q = session.query(Queue).filter_by(queue_name=queuename)
 
     try:
-        return q.one()
+        ret = q.one()
     except NoResultFound:
-        return None
+        queue = Queue()
+        queue.queue_name = queuename
+        session.add(queue)
+        session.commit_or_flush()
+        ret = queue
+
+    return ret
 
-__all__.append('get_queue')
+__all__.append('get_or_set_queue')
 
 ################################################################################