From: Mark Hymers <mhy@debian.org>
Date: Sun, 2 Aug 2009 14:31:29 +0000 (+0100)
Subject: session fixups in queue.py
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d9b0af0278f610ae75c37845fe9e95c7406af693;p=dak.git

session fixups in queue.py

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/daklib/queue.py b/daklib/queue.py
index ff7247ce..a1dcdf3c 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1950,7 +1950,7 @@ distribution."""
                                        file, version, sourceful=True)
 
     ################################################################################
-    def check_dsc_against_db(self, file):
+    def check_dsc_against_db(self, file, session=None):
         """
 
         @warning: NB: this function can remove entries from the 'files' index [if
@@ -1960,6 +1960,10 @@ distribution."""
          ensure you haven't just tried to dereference the deleted entry.
 
         """
+
+        if session is None:
+            session = DBConn().session()
+
         self.pkg.orig_tar_gz = None
 
         # Try and find all files mentioned in the .dsc.  This has
@@ -2012,7 +2016,7 @@ distribution."""
 
             elif dsc_name.endswith(".orig.tar.gz"):
                 # Check in the pool
-                ql = get_poolfile_like_name(dsc_name)
+                ql = get_poolfile_like_name(dsc_name, session)
 
                 # Strip out anything that isn't '%s' or '/%s$'
                 # TODO: Shouldn't we just search for things which end with our string explicitly in the SQL?