Revert "Revert "Merge commit 'stew/content_generation' into merge""

[dak.git] / daklib / database.py

diff --git a/daklib/database.py b/daklib/database.py
index 94e0a7cc51f81273d1d61f953653b6df7f5012d2..c274a637a84fd54c0af32075056dce5e6341c930 100755 (executable)
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -814,12 +814,12 @@ def copy_temporary_contents(package, version, deb):
     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,9 +829,8 @@ 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")
         utils.send_mail( message )
@@ -840,11 +839,11 @@ def copy_temporary_contents(package, version, deb):
 
     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))