X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontents.py;h=36546f58d926c795112c3743c957a74b7feeb0c8;hb=bd6fef7b1dd64686a5ac8d0ba1818ace17e115ca;hp=eaa1fb6b19d2d041a31aa22f76dc36ecd564a2d9;hpb=1fc2bf300a251648e71f85979e20f3d649c3caad;p=dak.git

diff --git a/dak/contents.py b/dak/contents.py
index eaa1fb6b..36546f58 100644
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -36,7 +36,6 @@ Create all the contents files
 
 import sys
 import os
-import tempfile
 import logging
 import math
 import gzip
@@ -124,14 +123,13 @@ contents_q = """PREPARE contents_q(int,int,int,int) as
               JOIN section s ON (s.id=o.section)
               WHERE (b.architecture = $1 OR b.architecture = $2)
                   AND ba.suite = $3
-                  AND o.suite = $4
+                  AND o.suite = $3
                   AND b.type = 'deb'
-                  AND o.type = '7'
+                  AND o.type = $4
               GROUP BY fn
               ORDER BY fn"""
 
-# find me all of the contents for a given .udeb
-udeb_contents_q = """PREPARE udeb_contents_q(int,int,int) as
+udeb_contents_q = """PREPARE udeb_contents_q(int,int,int,int,int) as
               SELECT (p.path||'/'||n.file) as fn,
                       comma_separated_list(s.section||'/'||b.package)
               FROM content_associations c
@@ -141,14 +139,16 @@ udeb_contents_q = """PREPARE udeb_contents_q(int,int,int) as
               JOIN bin_associations ba ON (b.id=ba.bin)
               JOIN override o ON (o.package=b.package)
               JOIN section s ON (s.id=o.section)
-              WHERE s.id = $1
-                  AND ba.suite = $2
-                  AND o.suite = $3
+              WHERE (b.architecture = $1 OR b.architecture = $2)
+                  AND s.id = $3
+                  AND ba.suite = $4
+                  AND o.suite = $4
                   AND b.type = 'udeb'
-                  AND o.type = '8'
+                  AND o.type = $5
               GROUP BY fn
               ORDER BY fn"""
 
+
 # clear out all of the temporarily stored content associations
 # this should be run only after p-a has run.  after a p-a
 # run we should have either accepted or rejected every package
@@ -178,6 +178,9 @@ class Contents(object):
     def __init__(self):
         self.header = None
 
+    def reject(self, message):
+        log.error("E: %s" % message)
+
     def _getHeader(self):
         """
         Internal method to return the header for Contents.gz files
@@ -226,7 +229,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])-1) / 8)))
                 f.write(contents[0] + ( '\t' * num_tabs ) + contents[-1] + "\n")
 
         finally:
@@ -252,9 +255,9 @@ class Contents(object):
         pooldir = Config()[ 'Dir::Pool' ]
 
         cursor = DBConn().cursor();
-        cursor.execute( debs_q )
-        cursor.execute( olddeb_q )
-        cursor.execute( arches_q )
+        DBConn().prepare("debs_q",debs_q)
+        DBConn().prepare("olddeb_q",olddeb_q)
+        DBConn().prepare("arches_q",arches_q)
 
         suites = self._suites()
         for suite in [i.lower() for i in suites]:
@@ -279,7 +282,7 @@ class Contents(object):
                     else:
                         debfile = os.path.join( pooldir, deb[1] )
                         if os.path.exists( debfile ):
-                            Binary(debfile).scan_package( deb[0] )
+                            Binary(debfile, self.reject).scan_package( deb[0] )
                         else:
                             log.error( "missing .deb: %s" % deb[1] )
 
@@ -289,9 +292,12 @@ class Contents(object):
         """
         cursor = DBConn().cursor();
 
-        cursor.execute( arches_q )
-        cursor.execute( contents_q )
-        cursor.execute( udeb_contents_q )
+        DBConn().prepare( "arches_q", arches_q )
+        DBConn().prepare( "contents_q", contents_q )
+        DBConn().prepare( "udeb_contents_q", udeb_contents_q )
+
+        debtype_id=DBConn().get_override_type_id("deb")
+        udebtype_id=DBConn().get_override_type_id("udeb")
 
         suites = self._suites()
 
@@ -303,18 +309,20 @@ class Contents(object):
             arch_all_id = DBConn().get_architecture_id("all")
 
             for arch_id in arch_list:
-                cursor.execute( "EXECUTE contents_q(%d,%d,%d,%d)" % (arch_id[0], arch_all_id, suite_id, suite_id))
+                cursor.execute("EXECUTE contents_q(%d,%d,%d,%d)" % (arch_id[0], arch_all_id, suite_id, debtype_id))
                 self._write_content_file(cursor, "dists/%s/Contents-%s.gz" % (suite, arch_id[1]))
 
             # The MORE fun part. Ok, udebs need their own contents files, udeb, and udeb-nf (not-free)
             # This is HORRIBLY debian specific :-/
-            for section_id, fn_pattern in [("debian-installer","dists/%s/Contents-udeb.gz"),
-                                           ("non-free/debian-installer", "dists/%s/Contents-udeb-nf.gz")]:
+            for section, fn_pattern in [("debian-installer","dists/%s/Contents-udeb-%s.gz"),
+                                           ("non-free/debian-installer", "dists/%s/Contents-udeb-nf-%s.gz")]:
+
+                for arch_id in arch_list:
+                    section_id = DBConn().get_section_id(section) # all udebs should be here)
+                    if section_id != -1:
+                        cursor.execute("EXECUTE udeb_contents_q(%d,%d,%d,%d,%d)" % (arch_id[0], arch_all_id, section_id, suite_id, udebtype_id))
 
-                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)
+                        self._write_content_file(cursor, fn_pattern % (suite, arch_id[1]))
 
 
 ################################################################################