X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdatabase.py;h=606e8f2de8ba76afbe38528ac77610684252dfe6;hb=3b7335ec8615387761937d34423581df226c22dc;hp=e8211899d2a9d6463fd2ef8837c725604e141bc4;hpb=0f147b0e3bb7f848bb4ede82dd9ac333cfa2e245;p=dak.git

diff --git a/daklib/database.py b/daklib/database.py
index e8211899..606e8f2d 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -32,6 +32,8 @@
 import sys
 import time
 import types
+import utils
+from binary import Binary
 
 ################################################################################
 
@@ -809,17 +811,17 @@ def get_suites(pkgname, src=False):
 
 ################################################################################
 
-def copy_temporary_contents(package, version, deb):
+def copy_temporary_contents(package, version, deb, reject):
     """
     copy the previously stored contents from the temp table to the permanant one
 
     during process-unchecked, the deb should have been scanned and the
-    contents stored in temp_content_associations
+    contents stored in pending_content_associations
     """
 
     # first see if contents exist:
 
-    exists = projectB.query("""SELECT 1 FROM temp_content_associations
+    exists = projectB.query("""SELECT 1 FROM pending_content_associations
                                WHERE package='%s' LIMIT 1""" % package ).getresult()
 
     if not exists:
@@ -829,22 +831,21 @@ def copy_temporary_contents(package, version, deb):
         subst = {
             "__PACKAGE__": package,
             "__VERSION__": version,
-            "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress",
-            "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"]
-            }
+            "__TO_ADDRESS__": Cnf["Dinstall::MyAdminAddress"],
+            "__DAK_ADDRESS__": Cnf["Dinstall::MyEmailAddress"] }
 
-        message = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/missing-contents")
+        message = utils.TemplateSubst(subst, Cnf["Dir::Templates"]+"/missing-contents")
         utils.send_mail( message )
 
-        exists = DBConn().insert_content_path(package, version, deb)
+        exists = Binary(deb, reject).scan_package()
 
     if exists:
         sql = """INSERT INTO content_associations(binary_pkg,filepath,filename)
-                 SELECT currval('binaries_id_seq'), filepath, filename FROM temp_content_associations
+                 SELECT currval('binaries_id_seq'), filepath, filename FROM pending_content_associations
                  WHERE package='%s'
                      AND version='%s'""" % (package, version)
         projectB.query(sql)
-        projectB.query("""DELETE from temp_content_associations
+        projectB.query("""DELETE from pending_content_associations
                           WHERE package='%s'
                             AND version='%s'""" % (package, version))