X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=c525122e516c5a49acbb1658d1d0e2f7b8d87c9b;hb=4d67c5b3de7c0cc7b9efd35f667a54d9287662ef;hp=a134935715d28cd337bcaa00158c33889d5b872d;hpb=8ecf66b7d933929ca5f504a32fb54542b0b87b71;p=dak.git diff --git a/denise b/denise index a1349357..c525122e 100755 --- a/denise +++ b/denise @@ -1,8 +1,8 @@ #!/usr/bin/env python # Output override files for apt-ftparchive and indices/ -# Copyright (C) 2000, 2001, 2002 James Troup -# $Id: denise,v 1.10 2002-05-08 11:13:02 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2004 James Troup +# $Id: denise,v 1.16 2004-01-21 03:19:52 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,14 +18,16 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +################################################################################ + # This is seperate because it's horribly Debian specific and I don't # want that kind of horribleness in the otherwise generic natalie. It # does duplicate code tho. ################################################################################ -import pg, sys, string -import utils, db_access +import pg, sys; +import utils, db_access; import apt_pkg; ################################################################################ @@ -36,7 +38,16 @@ override = {} ################################################################################ -def list(suite, component, type): +def usage(exit_code=0): + print """Usage: denise +Outputs the override tables to text files. + + -h, --help show this help and exit.""" + sys.exit(exit_code) + +################################################################################ + +def list(file, suite, component, type): global override; suite_id = db_access.get_suite_id(suite); @@ -62,13 +73,13 @@ def list(suite, component, type): q = projectB.query("SELECT o.package, s.section, o.maintainer FROM override o, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.section = s.id ORDER BY s.section, o.package" % (suite_id, component_id, type_id)); for i in q.getresult(): override[suite][component][type][i[0]] = i; - print utils.result_join(i); + file.write(utils.result_join(i)+'\n'); else: q = projectB.query("SELECT o.package, p.priority, s.section, o.maintainer, p.level FROM override o, priority p, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.priority = p.id AND o.section = s.id ORDER BY s.section, p.level, o.package" % (suite_id, component_id, type_id)); for i in q.getresult(): i = i[:-1]; # Strip the priority level override[suite][component][type][i[0]] = i; - print utils.result_join(i); + file.write(utils.result_join(i)+'\n'); ################################################################################ @@ -76,10 +87,14 @@ def main (): global Cnf, projectB, override; Cnf = utils.get_conf() - Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"), - ('h',"help","Denise::Options::Help"), - ('V',"version","Denise::Options::Version")]; + Arguments = [('h',"help","Denise::Options::Help")]; + for i in [ "help" ]: + if not Cnf.has_key("Denise::Options::%s" % (i)): + Cnf["Denise::Options::%s" % (i)] = ""; apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); + Options = Cnf.SubTree("Denise::Options") + if Options["Help"]: + usage(); projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); @@ -90,7 +105,7 @@ def main (): for component in Cnf.SubTree("Component").List(): if component == "mixed": continue; # Ick - for type in Cnf.SubTree("OverrideType").List(): + for type in Cnf.ValueList("OverrideType"): if type == "deb": override_type = ""; elif type == "udeb": @@ -99,11 +114,10 @@ def main (): override_type = ".debian-installer"; elif type == "dsc": override_type = ".src"; - filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, string.replace(component, "non-US/", ""), override_type); + filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), override_type); file = utils.open_file(filename, 'w'); - sys.stdout = file; - list(suite, component, type); - sys.stdout.close(); + list(file, suite, component, type); + file.close(); # Munge the override file for testing by using unstable's where # possible and falling back on stable's where it's not. @@ -116,29 +130,38 @@ def main (): if component == "mixed": continue; component_id = db_access.get_component_id(component); - for type in Cnf.SubTree("OverrideType").List(): - if type == "deb": - override_type = ""; - q = projectB.query("SELECT DISTINCT b.package FROM bin_associations ba, binaries b, files f, location l WHERE ba.suite = %s AND l.component = %s AND ba.bin = b.id AND b.file = f.id AND f.location = l.id" % (suite_id, component_id)); + for type in Cnf.ValueList("OverrideType"): + if type == "deb" or type == "udeb": + if type == "deb": + override_type = ""; + elif type == "udeb": + if component != "main": + continue; + override_type = ".debian-installer"; + q = projectB.query("SELECT DISTINCT b.package FROM bin_associations ba, binaries b, files f, location l WHERE ba.suite = %s AND l.component = %s AND b.type = '%s' AND ba.bin = b.id AND b.file = f.id AND f.location = l.id" % (suite_id, component_id, type)); elif type == "dsc": q = projectB.query("SELECT DISTINCT s.source FROM src_associations sa, source s, files f, location l WHERE sa.suite = %s AND l.component = %s AND sa.source = s.id AND s.file = f.id AND f.location = l.id" % (suite_id, component_id)); override_type = ".src"; - elif type == "udeb": - continue; - filename = "override.%s.%s%s" % (override_suite, string.replace(component, "non-US/", ""), override_type); + filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), override_type); file = utils.open_file(filename, 'w'); - sys.stdout = file; for i in q.getresult(): package = i[0]; - if override["unstable"][component][type].has_key(package): - print utils.result_join(override["unstable"][component][type][package]); - elif override["stable"][component][type].has_key(package): - print utils.result_join(override["stable"][component][type][package]); - else: - if type == "dsc" and (override["unstable"][component]["deb"].has_key(package) or override["stable"][component]["deb"].has_key(package)): - continue; # source falls back on binary; so accept silently - utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type)); - sys.stdout.close(); + if type == "deb" or type == "dsc": + if override["unstable"][component][type].has_key(package): + file.write(utils.result_join(override["unstable"][component][type][package])+'\n'); + elif override["stable"][component][type].has_key(package): + file.write(utils.result_join(override["stable"][component][type][package])+'\n'); + else: + if type == "dsc" and (override["unstable"][component]["deb"].has_key(package) or override["stable"][component]["deb"].has_key(package)): + continue; # source falls back on binary; so accept silently + utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type)); + elif type == "udeb": + if component == "main" and override["unstable"][component][type].has_key(package): + file.write(utils.result_join(override["unstable"][component][type][package])+'\n'); + else: + utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type)); + + file.close(); #######################################################################################