Merge branch 'master' into content_generation

[dak.git] / dak / contents.py

diff --git a/dak/contents.py b/dak/contents.py
index dbd94f92676732eb753e55124fef21f9753e0a9d..963bf494842904663c354c9d234bdcd58f4ca941 100644 (file)
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -70,10 +70,10 @@ OPTIONS
         supress all output but errors
 
      -s, --suite={stable,testing,unstable,...}
-        only operate on a signle suite
+        only operate on a single suite
 
      -a, --arch={i386,amd64}
-        only operate on a signle architecture
+        only operate on a single architecture
 """
     sys.exit(exit_code)
 
@@ -82,15 +82,12 @@ OPTIONS
 # where in dak.conf all of our configuration will be stowed
 
 options_prefix = "Contents"
-options_prefix = "%s::Opitons" % options_prefix
+options_prefix = "%s::Options" % options_prefix
 
 log = logging.getLogger()
 
 ################################################################################
 
-# we unfortunately still have broken stuff in headers
-latin1_q = """SET CLIENT_ENCODING TO 'LATIN1'"""
-
 # get all the arches delivered for a given suite
 # this should probably exist somehere common
 arches_q = """PREPARE arches_q as
@@ -155,7 +152,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 +236,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" )
@@ -252,7 +249,6 @@ class Contents(object):
         pooldir = Config()[ 'Dir::Pool' ]
 
         cursor = DBConn().cursor();
-        cursor.execute( latin1_q )
         cursor.execute( debs_q )
         cursor.execute( olddeb_q )
         cursor.execute( arches_q )
@@ -308,18 +304,13 @@ class Contents(object):
 
             # The MORE fun part. Ok, udebs need their own contents files, udeb, and udeb-nf (not-free)
             # This is HORRIBLY debian specific :-/
-            # First off, udeb
-            section_id = DBConn().get_section_id('debian-installer') # all udebs should be here)
-            if section_id != -1:
-                cursor.execute("EXECUTE udeb_contents_q(%d,%d,%d)" % (section_id, suite_id, suite_id))
-                self._write_content_file(cursor, "dists/%s/Contents-udeb.gz" % suite)
-
-            # Once more, with non-free
-            section_id = DBConn().get_section_id('non-free/debian-installer') # all udebs should be here)
+            for section_id, fn_pattern in [("debian-installer","dists/%s/Contents-udeb.gz"),
+                                           ("non-free/debian-installer", "dists/%s/Contents-udeb-nf.gz")]
 
+            section_id = DBConn().get_section_id(section_id) # all udebs should be here)
             if section_id != -1:
                 cursor.execute("EXECUTE udeb_contents_q(%d,%d,%d)" % (section_id, suite_id, suite_id))
-                self._write_content_file(cursor, "dists/%s/Contents-udeb-nf.gz" % suite)
+                self._write_content_file(cursor, fn_pattern % suite)
 
 
 ################################################################################