X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=6d5497fc2d5f4b096d972631637e284eb2ce00aa;hb=852b95bdefa52aead80cad3a51381535774dc48a;hp=56ff65aa9dc730cc1e9e40dcfd63fd649d4a2ff6;hpb=383fcee18cb81cfdd2467bedd4b9eb3481a52f91;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 56ff65aa..6d5497fc 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -1464,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 @@ -1482,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') ################################################################################