X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=9677460987944bffa44960c8c20bba11828f2d5f;hb=bfa2095bc1519f2b31faf9d2cde70ea6ef32adbc;hp=bde3776fed0d9d59bdc7ccb9208c640b7c4d4d9b;hpb=4b41dc06229eed89f52f397fc7df5d665fa092cf;p=dak.git diff --git a/denise b/denise index bde3776f..96774609 100755 --- a/denise +++ b/denise @@ -1,8 +1,8 @@ #!/usr/bin/env python # Output override files for apt-ftparchive and indices/ -# Copyright (C) 2000 James Troup -# $Id: denise,v 1.2 2001-01-16 21:52:37 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2004 James Troup +# $Id: denise,v 1.17 2004-11-27 17:56:42 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, natalie +import pg, sys; +import utils, db_access; import apt_pkg; ################################################################################ @@ -36,82 +38,83 @@ 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 do_list(output_file, suite, component, otype): global override; - + suite_id = db_access.get_suite_id(suite); if suite_id == -1: - sys.stderr.write("Suite '%s' not recognised.\n" % (suite)); - sys.exit(2); + utils.fubar("Suite '%s' not recognised." % (suite)); component_id = db_access.get_component_id(component); if component_id == -1: - sys.stderr.write("Component '%s' not recognised.\n" % (component)); - sys.exit(2); - - type_id = db_access.get_override_type_id(type); - if type_id == -1: - sys.stderr.write("Type '%s' not recognised. (Valid types are deb, udeb and dsc.)\n" % (type)); - sys.exit(2); - - if not override.has_key(suite): - override[suite] = {}; - if not override[suite].has_key(component): - override[suite][component] = {}; - if not override[suite][component].has_key(type): - override[suite][component][type] = {}; - - if type == "dsc": - 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)); + utils.fubar("Component '%s' not recognised." % (component)); + + otype_id = db_access.get_override_type_id(otype); + if otype_id == -1: + utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (otype)); + + override.setdefault(suite, {}); + override[suite].setdefault(component, {}); + override[suite][component].setdefault(otype, {}); + + if otype == "dsc": + 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, otype_id)); for i in q.getresult(): - override[suite][component][type][i[0]] = i; - print string.join(i, '\t'); + override[suite][component][otype][i[0]] = i; + output_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)); + 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, otype_id)); for i in q.getresult(): i = i[:-1]; # Strip the priority level - override[suite][component][type][i[0]] = i; - print string.join(i, '\t'); + override[suite][component][otype][i[0]] = i; + output_file.write(utils.result_join(i)+'\n'); ################################################################################ def main (): global Cnf, projectB, override; - apt_pkg.init(); - - Cnf = apt_pkg.newConfiguration(); - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); - Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"), - ('h',"help","Denise::Options::Help"), - ('V',"version","Denise::Options::Version")]; + Cnf = utils.get_conf() + 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('projectb', 'localhost'); + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); - natalie.init(); - for suite in [ "stable", "unstable" ]: sys.stderr.write("Processing %s...\n" % (suite)); override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)]; for component in Cnf.SubTree("Component").List(): if component == "mixed": continue; # Ick - for type in Cnf.SubTree("OverrideType").List(): - if type == "deb": - override_type = ""; - elif type == "udeb": + for otype in Cnf.ValueList("OverrideType"): + if otype == "deb": + suffix = ""; + elif otype == "udeb": if suite != "unstable" or component != "main": continue; # Ick2 - override_type = ".debian-installer"; - elif type == "dsc": - override_type = ".src"; - filename = "override.%s.%s%s" % (override_suite, string.replace(component, "non-US/", ""), override_type); - file = utils.open_file(filename, 'w'); - sys.stdout = file; - list(suite, component, type); - sys.stdout.close(); + suffix = ".debian-installer"; + elif otype == "dsc": + suffix = ".src"; + filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), suffix); + output_file = utils.open_file(filename, 'w'); + do_list(output_file, suite, component, otype); + output_file.close(); # Munge the override file for testing by using unstable's where # possible and falling back on stable's where it's not. @@ -124,33 +127,40 @@ 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)); - elif type == "dsc": + for otype in Cnf.ValueList("OverrideType"): + if otype == "deb" or otype == "udeb": + if otype == "deb": + suffix = ""; + elif otype == "udeb": + if component != "main": + continue; + suffix = ".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, otype)); + elif otype == "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); - file = utils.open_file(filename, 'w'); - sys.stdout = file; + suffix = ".src"; + filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), suffix); + output_file = utils.open_file(filename, 'w'); for i in q.getresult(): package = i[0]; - if override["unstable"][component][type].has_key(package): - print string.join(override["unstable"][component][type][package], '\t'); - elif override["stable"][component][type].has_key(package): - print string.join(override["stable"][component][type][package], '\t'); - 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 - sys.stderr.write("W: Can't find override entry for testing package '%s' (component %s, type %s).\n" % (package, component, type)); - sys.stdout.close(); - - -####################################################################################### + if otype == "deb" or otype == "dsc": + if override["unstable"][component][otype].has_key(package): + output_file.write(utils.result_join(override["unstable"][component][otype][package])+'\n'); + elif override["stable"][component][otype].has_key(package): + output_file.write(utils.result_join(override["stable"][component][otype][package])+'\n'); + else: + if otype == "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, otype)); + elif otype == "udeb": + if component == "main" and override["unstable"][component][otype].has_key(package): + output_file.write(utils.result_join(override["unstable"][component][otype][package])+'\n'); + else: + utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, otype)); + + output_file.close(); -if __name__ == '__main__': - main() +################################################################################ +if __name__ == '__main__': + main();