X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=07e3c22abc0514f179d8c6cf854639fc4dadd85b;hb=d44faefd78782178bddbaf494c0aa453114f460a;hp=aa2926a0c85be6a8f181e738ec57964589d9cc71;hpb=b373c111451a76576c9bf30eefff27df959d66e0;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index aa2926a0..07e3c22a 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
 
@@ -326,7 +315,7 @@ def check_distributions():
             (source, dest) = args[1:3]
             if changes["distribution"].has_key(source):
                 for arch in changes["architecture"].keys():
-                    if arch not in database.get_suite_architectures(source):
+                    if arch not in DBConn().get_suite_architectures(source):
                         reject("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch),"")
                         del changes["distribution"][source]
                         changes["distribution"][dest] = 1
@@ -400,7 +389,7 @@ 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
+    cursor.execute("""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
@@ -474,7 +463,7 @@ def check_files():
             default_suite = Cnf.get("Dinstall::DefaultSuite", "Unstable")
             architecture = control.Find("Architecture")
             upload_suite = changes["distribution"].keys()[0]
-            if architecture not in database.get_suite_architectures(default_suite) and architecture not in database.get_suite_architectures(upload_suite):
+            if architecture not in DBConn().get_suite_architectures(default_suite) and architecture not in DBConn().get_suite_architectures(upload_suite):
                 reject("Unknown architecture '%s'." % (architecture))
 
             # Ensure the architecture of the .deb is one of the ones
@@ -572,7 +561,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 +878,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()