X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=3c702daedb641d5202a693fbcd1174548a6aa98f;hb=9a89f745ed13e05507dd5297fa4a860c4fdc2b2e;hp=bde3776fed0d9d59bdc7ccb9208c640b7c4d4d9b;hpb=4b41dc06229eed89f52f397fc7df5d665fa092cf;p=dak.git diff --git a/denise b/denise index bde3776f..3c702dae 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 James Troup +# $Id: denise,v 1.11 2002-05-14 15:28:53 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 @@ -25,7 +25,7 @@ ################################################################################ import pg, sys, string -import utils, db_access, natalie +import utils, db_access import apt_pkg; ################################################################################ @@ -38,21 +38,18 @@ override = {} def list(suite, component, type): 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); + utils.fubar("Component '%s' not recognised." % (component)); 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); + utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type)); if not override.has_key(suite): override[suite] = {}; @@ -65,40 +62,35 @@ 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 string.join(i, '\t'); + print utils.result_join(i); 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 string.join(i, '\t'); + print utils.result_join(i); ################################################################################ def main (): global Cnf, projectB, override; - apt_pkg.init(); - - Cnf = apt_pkg.newConfiguration(); - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); + Cnf = utils.get_conf() Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"), ('h',"help","Denise::Options::Help"), ('V',"version","Denise::Options::Version")]; apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - 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(): + for type in Cnf.ValueList("OverrideType"): if type == "deb": override_type = ""; elif type == "udeb": @@ -107,7 +99,7 @@ def main (): override_type = ".debian-installer"; elif type == "dsc": override_type = ".src"; - 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, string.replace(component, "non-US/", ""), override_type); file = utils.open_file(filename, 'w'); sys.stdout = file; list(suite, component, type); @@ -124,7 +116,7 @@ def main (): if component == "mixed": continue; component_id = db_access.get_component_id(component); - for type in Cnf.SubTree("OverrideType").List(): + for type in Cnf.ValueList("OverrideType"): 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)); @@ -139,15 +131,14 @@ def main (): 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'); + print utils.result_join(override["unstable"][component][type][package]); elif override["stable"][component][type].has_key(package): - print string.join(override["stable"][component][type][package], '\t'); + 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 - sys.stderr.write("W: Can't find override entry for testing package '%s' (component %s, type %s).\n" % (package, component, type)); + utils.warn("Can't find override entry for testing package '%s' (component %s, type %s)." % (package, component, type)); sys.stdout.close(); - #######################################################################################