Revert "for the time we test, modify the path to a non-world-visible one"

[dak.git] / dak / contents.py

diff --git a/dak/contents.py b/dak/contents.py
index f423b197cd21523358c5691c881e46cbe0aaa94b..3444071cdb34a9860f5f62f5ae7c0427e3830332 100644 (file)
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -42,6 +42,7 @@ import math
 import gzip
 import apt_pkg
 from daklib import utils
+from daklib.binary import Binary
 from daklib.config import Config
 from daklib.dbconn import DBConn
 ################################################################################
@@ -88,9 +89,6 @@ 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
@@ -162,7 +160,7 @@ remove_filename_cruft_q = """DELETE FROM content_file_names
                              WHERE id IN (SELECT cfn.id FROM content_file_names cfn
                                           LEFT JOIN content_associations ca
                                             ON ca.filename=cfn.id
-                                          WHERE ca.id IS NULL)""" );
+                                          WHERE ca.id IS NULL)"""
 
 # delete any paths we are storing which have no binary associated with them
 remove_filepath_cruft_q = """DELETE FROM content_file_paths
@@ -193,14 +191,12 @@ class Contents(object):
                     h = open(os.path.join( Config()["Dir::Templates"],
                                            Config()["Contents::Header"] ), "r")
                     self.header = h.read()
-                    print( "header: %s" % self.header )
                     h.close()
                 except:
                     log.error( "error opening header file: %d\n%s" % (Config()["Contents::Header"],
                                                                       traceback.format_exc() ))
                     self.header = False
             else:
-                print( "no header" )
                 self.header = False
 
         return self.header
@@ -213,7 +209,11 @@ class Contents(object):
         Internal method for writing all the results to a given file.
         The cursor should have a result set generated from a query already.
         """
-        f = gzip.open(Config()["Dir::Root"] + filename, "w")
+        filepath = Config()["Contents::Root"] + filename
+        filedir = os.path.dirname(filepath)
+        if not os.path.isdir(filedir):
+            os.makedirs(filedir)
+        f = gzip.open(filepath, "w")
         try:
             header = self._getHeader()
 
@@ -226,7 +226,7 @@ class Contents(object):
                     return
 
                 num_tabs = max(1,
-                               int( math.ceil( (self._goal_column - len(contents[0])) / 8) ) )
+                               int(math.ceil((self._goal_column - len(contents[0])) / 8)))
                 f.write(contents[0] + ( '\t' * num_tabs ) + contents[-1] + "\n")
 
         finally:
@@ -252,7 +252,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 )
@@ -266,26 +265,27 @@ class Contents(object):
             for arch_id in arch_list:
                 cursor.execute( "EXECUTE debs_q(%d, %d)" % ( suite_id, arch_id[0] ) )
 
-                debs = cursor.fetchall()
                 count = 0
-                for deb in debs:
+                while True:
+                    deb = cursor.fetchone()
+                    if not deb:
+                        break
                     count += 1
-                    cursor.execute( "EXECUTE olddeb_q(%d)" % (deb[0] ) )
-                    old = cursor.fetchone()
+                    cursor1 = DBConn().cursor();
+                    cursor1.execute( "EXECUTE olddeb_q(%d)" % (deb[0] ) )
+                    old = cursor1.fetchone()
                     if old:
                         log.debug( "already imported: %s" % deb[1] )
                     else:
                         debfile = os.path.join( pooldir, deb[1] )
                         if os.path.exists( debfile ):
-                            contents = utils.generate_contents_information( debfile )
-                            DBConn().insert_content_paths(deb[0], contents)
-                            log.info( "imported (%d/%d): %s" % (count,len(debs),deb[1] ) )
+                            Binary(debfile).scan_package( deb[0] )
                         else:
                             log.error( "missing .deb: %s" % deb[1] )
 
     def generate(self):
         """
-        Generate Contents-$arch.gz files for every aviailable arch in each given suite.
+        Generate Contents-$arch.gz files for every available arch in each given suite.
         """
         cursor = DBConn().cursor();
 
@@ -308,18 +308,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)
-
-            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)
+            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, fn_pattern % suite)
 
 
 ################################################################################