From: Mark Hymers <mhy@debian.org>
Date: Sat, 21 Feb 2009 18:47:42 +0000 (+0000)
Subject: temp_content_associations -> pending_content_associations
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ba0abf27fe030bd428918d584d9c8032bbd783dc;p=dak.git

temp_content_associations -> pending_content_associations

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

diff --git a/dak/contents.py b/dak/contents.py
index c7d47bd3..f423b197 100644
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -155,7 +155,7 @@ udeb_contents_q = """PREPARE udeb_contents_q as
 # this should be run only after p-a has run.  after a p-a
 # run we should have either accepted or rejected every package
 # so there should no longer be anything in the queue
-remove_temp_contents_cruft_q = """DELETE FROM temp_content_associations"""
+remove_pending_contents_cruft_q = """DELETE FROM pending_content_associations"""
 
 # delete any filenames we are storing which have no binary associated with them
 remove_filename_cruft_q = """DELETE FROM content_file_names
@@ -239,7 +239,7 @@ class Contents(object):
         """
         cursor = DBConn().cursor();
         cursor.execute( "BEGIN WORK" )
-        cursor.execute( remove_temp_contents_cruft_q )
+        cursor.execute( remove_pending_contents_cruft_q )
         cursor.execute( remove_filename_cruft_q )
         cursor.execute( remove_filepath_cruft_q )
         cursor.execute( "COMMIT" )
diff --git a/daklib/database.py b/daklib/database.py
index e8211899..3b6ded05 100755
--- 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:
@@ -840,11 +840,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))
 
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 5bd1d765..6070cded 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -470,7 +470,7 @@ class DBConn(Singleton):
         try:
 
                 # Remove any already existing recorded files for this package
-            c.execute("""DELETE FROM temp_content_associations
+            c.execute("""DELETE FROM pending_content_associations
                          WHERE package=%(Package)s
                          AND version=%(Version)s""", package )
 
@@ -481,7 +481,7 @@ class DBConn(Singleton):
                 file_id = self.get_or_set_contents_file_id(file)
                 path_id = self.get_or_set_contents_path_id(path)
 
-                c.execute("""INSERT INTO temp_content_associations
+                c.execute("""INSERT INTO pending_content_associations
                                (package, version, filepath, filename)
                            VALUES (%%(Package)s, %%(Version)s, '%d', '%d')""" % (path_id, file_id),
                           package )