]> err.no Git - dak/commitdiff
temp_content_associations -> pending_content_associations
authorMark Hymers <mhy@debian.org>
Sat, 21 Feb 2009 18:47:42 +0000 (18:47 +0000)
committerMike O'Connor <stew@vireo.org>
Sun, 22 Feb 2009 13:41:11 +0000 (08:41 -0500)
Signed-off-by: Mark Hymers <mhy@debian.org>
dak/contents.py
daklib/database.py
daklib/dbconn.py

index c7d47bd32f5536d4bb1d18fb2c709dde82f6ea15..f423b197cd21523358c5691c881e46cbe0aaa94b 100644 (file)
@@ -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" )
index e8211899d2a9d6463fd2ef8837c725604e141bc4..3b6ded05bdb56b728e41475b8a0215af9cd9cbae 100755 (executable)
@@ -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))
 
index 5bd1d76595717043fb744d1715d33612e8d9c442..6070cded680d560e9cfc4ccca366993eea30c8a7 100755 (executable)
@@ -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 )