X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=denise;h=11c3fca2da79194729c695b258e179fda052cbe1;hb=d0a891d7eb8d79b747f031392dd29de3acd68d84;hp=2e2c16e40cbd374ad20e99bc614cb411263b56fa;hpb=6ada259d555e36a1546789c280edc3f944b7de7f;p=dak.git diff --git a/denise b/denise index 2e2c16e4..11c3fca2 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 James Troup -# $Id: denise,v 1.5 2001-06-22 22:53:14 troup Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $Id: denise,v 1.12 2002-06-05 00:18: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 @@ -18,6 +18,8 @@ # 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. @@ -25,7 +27,7 @@ ################################################################################ import pg, sys, string -import utils, db_access, natalie +import utils, db_access import apt_pkg; ################################################################################ @@ -36,9 +38,9 @@ override = {} ################################################################################ -def list(suite, component, type): +def list(file, suite, component, type): global override; - + suite_id = db_access.get_suite_id(suite); if suite_id == -1: utils.fubar("Suite '%s' not recognised." % (suite)); @@ -62,23 +64,20 @@ 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'); + 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 string.join(i, '\t'); + 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()); + Cnf = utils.get_conf() Arguments = [('D',"debug","Denise::Options::Debug", "IntVal"), ('h',"help","Denise::Options::Help"), ('V',"version","Denise::Options::Version")]; @@ -87,15 +86,13 @@ def main (): 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" ]: - print "Processing %s..." % (suite); + 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": @@ -104,16 +101,15 @@ def main (): override_type = ".debian-installer"; elif type == "dsc": override_type = ".src"; - filename = "%s/override.%s.%s%s" % (Cnf["Dir::OverrideDir"], 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); - 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. - print "Processing testing..."; + sys.stderr.write("Processing testing...\n"); suite = "testing"; suite_id = db_access.get_suite_id(suite); override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)]; @@ -121,7 +117,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)); @@ -132,19 +128,17 @@ def main (): continue; filename = "override.%s.%s%s" % (override_suite, string.replace(component, "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 string.join(override["unstable"][component][type][package], '\t'); + file.write(utils.result_join(override["unstable"][component][type][package])+'\n'); elif override["stable"][component][type].has_key(package): - print string.join(override["stable"][component][type][package], '\t'); + 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)); - sys.stdout.close(); - + file.close(); #######################################################################################