X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontents.py;h=b2e9816f874a019af77a4fe1a7ec02252da6fae1;hb=0e1df5636799153ae78c13d299b772b0654106c8;hp=36546f58d926c795112c3743c957a74b7feeb0c8;hpb=bd6fef7b1dd64686a5ac8d0ba1818ace17e115ca;p=dak.git diff --git a/dak/contents.py b/dak/contents.py old mode 100644 new mode 100755 index 36546f58..b2e9816f --- a/dak/contents.py +++ b/dak/contents.py @@ -112,41 +112,33 @@ olddeb_q = """PREPARE olddeb_q(int) as # find me all of the contents for a given .deb contents_q = """PREPARE contents_q(int,int,int,int) as - SELECT (p.path||'/'||n.file) AS fn, + SELECT (p.path||'/'||n.file) AS fn, comma_separated_list(s.section||'/'||b.package) - FROM content_associations c - JOIN content_file_paths p ON (c.filepath=p.id) + from content_associations c join content_file_paths p ON (c.filepath=p.id) JOIN content_file_names n ON (c.filename=n.id) JOIN binaries b ON (b.id=c.binary_pkg) - 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 (b.architecture = $1 OR b.architecture = $2) - AND ba.suite = $3 - AND o.suite = $3 - AND b.type = 'deb' - AND o.type = $4 + WHERE o.suite = $1 AND o.type = $2 + AND b.id in (SELECT ba.bin from bin_associations ba join binaries b on b.id=ba.bin where (b.architecture=$3 or b.architecture=$4)and ba.suite=$1 and b.type='deb') GROUP BY fn - ORDER 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,int,int) as - SELECT (p.path||'/'||n.file) as fn, + SELECT (p.path||'/'||n.file) AS fn, comma_separated_list(s.section||'/'||b.package) - FROM content_associations c - JOIN content_file_paths p ON (c.filepath=p.id) + FROM content_file_paths p join content_associations c ON (c.filepath=p.id) JOIN content_file_names n ON (c.filename=n.id) JOIN binaries b ON (b.id=c.binary_pkg) - 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 (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 = $5 + WHERE o.suite = $1 AND o.type = $2 + AND s.id = $3 + AND b.id in (SELECT ba.bin from bin_associations ba join binaries b on b.id=ba.bin where (b.architecture=$3 or b.architecture=$4)and ba.suite=$1 and b.type='udeb') GROUP BY fn - ORDER BY fn""" + ORDER BY fn;""" + # clear out all of the temporarily stored content associations @@ -228,9 +220,7 @@ class Contents(object): if not contents: return - num_tabs = max(1, - int(math.ceil((self._goal_column - len(contents[0])-1) / 8))) - f.write(contents[0] + ( '\t' * num_tabs ) + contents[-1] + "\n") + f.write("%s\t%s\n" % contents ) finally: f.close() @@ -278,23 +268,24 @@ class Contents(object): cursor1.execute( "EXECUTE olddeb_q(%d)" % (deb[0] ) ) old = cursor1.fetchone() if old: - log.debug( "already imported: %s" % deb[1] ) + log.debug( "already imported: %s" % (deb[1]) ) else: + log.debug( "scanning: %s" % (deb[1]) ) debfile = os.path.join( pooldir, deb[1] ) if os.path.exists( debfile ): - Binary(debfile, self.reject).scan_package( deb[0] ) + Binary(debfile, self.reject).scan_package(deb[0],True) else: - log.error( "missing .deb: %s" % deb[1] ) + log.error("missing .deb: %s" % deb[1]) def generate(self): """ Generate Contents-$arch.gz files for every available arch in each given suite. """ - cursor = DBConn().cursor(); + cursor = DBConn().cursor() - DBConn().prepare( "arches_q", arches_q ) - DBConn().prepare( "contents_q", contents_q ) - DBConn().prepare( "udeb_contents_q", 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") @@ -309,7 +300,7 @@ 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, debtype_id)) + cursor.execute("EXECUTE contents_q(%d,%d,%d,%d)" % (suite_id, debtype_id, arch_all_id, arch_id[0] )) 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) @@ -320,7 +311,7 @@ class Contents(object): 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)) + cursor.execute("EXECUTE udeb_contents_q(%d,%d,%d,%d,%d)" % (suite_id, udebtype_id, section_id, arch_id[0], arch_all_id)) self._write_content_file(cursor, fn_pattern % (suite, arch_id[1])) @@ -361,6 +352,7 @@ class Contents(object): ################################################################################ + def main(): cnf = Config() @@ -376,6 +368,14 @@ def main(): 'cruft' : Contents.cruft, } + args = apt_pkg.ParseCommandLine(cnf.Cnf, arguments,sys.argv) + + if (len(args) < 1) or not commands.has_key(args[0]): + usage() + + if cnf.has_key("%s::%s" % (options_prefix,"Help")): + usage() + level=logging.INFO if cnf.has_key("%s::%s" % (options_prefix,"Quiet")): level=logging.ERROR @@ -388,14 +388,6 @@ def main(): format='%(asctime)s %(levelname)s %(message)s', stream = sys.stderr ) - args = apt_pkg.ParseCommandLine(cnf.Cnf, arguments,sys.argv) - - if (len(args) < 1) or not commands.has_key(args[0]): - usage() - - if cnf.has_key("%s::%s" % (options_prefix,"Help")): - usage() - commands[args[0]](Contents()) if __name__ == '__main__':