X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=5bd8bf2c1359bfe96a1d775aac2f7f130fb8ec0f;hb=b7e5c9a6deda1018da9023d1d01acec86e165ba4;hp=491c5560ec7b7c968b17bbeeb37c4514f778c049;hpb=2ae7b715431fed62b6a619e6d1b027d919da1070;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 491c5560..5bd8bf2c 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -37,7 +37,6 @@ import shutil
 import stat
 import sys
 import time
-import tempfile
 import traceback
 import tarfile
 import apt_inst
@@ -145,16 +144,6 @@ def reject (str, prefix="Rejected: "):
 
 ################################################################################
 
-def create_tmpdir():
-    """
-    Create a temporary directory that can be used for unpacking files into for
-    checking
-    """
-    tmpdir = tempfile.mkdtemp()
-    return tmpdir
-
-################################################################################
-
 def copy_to_holding(filename):
     global in_holding
 
@@ -400,7 +389,8 @@ def check_files():
     cursor = DBConn().cursor()
     # Check for packages that have moved from one component to another
     # STU: this should probably be changed to not join on architecture, suite tables but instead to used their cached name->id mappings from DBConn
-    cursor.execute("""PREPARE moved_pkg_q AS
+    DBConn().prepare("moved_pkg_q", """
+        PREPARE moved_pkg_q(text,text,text) AS
         SELECT c.name FROM binaries b, bin_associations ba, suite s, location l,
                     component c, architecture a, files f
         WHERE b.package = $1 AND s.suite_name = $2
@@ -572,7 +562,7 @@ def check_files():
             # Check the version and for file overwrites
             reject(Upload.check_binary_against_db(f),"")
 
-            Binary(f).scan_package()
+            Binary(f, reject).scan_package()
 
         # Checks for a source package...
         else:
@@ -889,7 +879,7 @@ def check_source():
        or pkg.orig_tar_gz == -1:
         return
 
-    tmpdir = create_tmpdir()
+    tmpdir = utils.temp_dirname()
 
     # Move into the temporary directory
     cwd = os.getcwd()
@@ -1330,11 +1320,11 @@ def is_stableupdate ():
         cursor.execute( """SELECT 1 FROM source s
                            JOIN src_associations sa ON (s.id = sa.source)
                            WHERE s.source = %(source)s
-                              AND s.version = '%(version)s'
+                              AND s.version = %(version)s
                               AND sa.suite = %(suite)d""",
                         {'source' : changes['source'],
                          'version' : changes['version'],
-                         'suite' : pasuite})
+                         'suite' : pusuite})
 
         if cursor.fetchone():
             # source is already in proposed-updates so no need to hold
@@ -1369,7 +1359,7 @@ def is_oldstableupdate ():
                                AND sa.suite = %d""",
                         {'source' : changes['source'],
                          'version' : changes['version'],
-                         'suite' : pasuite})
+                         'suite' : pusuite})
         if cursor.fetchone():
             return 0