X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_overrides.py;h=569ee7696d831f4312ddad7e9e012b57a5232587;hb=6f863f95e3d1bae18aa5579e958fd8a121b06545;hp=cae1bb6d16f6351c82aef7a0a04c3d62bba7084e;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git diff --git a/dak/make_overrides.py b/dak/make_overrides.py index cae1bb6d..569ee769 100755 --- a/dak/make_overrides.py +++ b/dak/make_overrides.py @@ -1,8 +1,11 @@ #!/usr/bin/env python -# Output override files for apt-ftparchive and indices/ -# Copyright (C) 2000, 2001, 2002, 2004 James Troup -# $Id: denise,v 1.18 2005-11-15 09:50:32 ajt Exp $ +""" +Output override files for apt-ftparchive and indices/ +@contact: Debian FTP Master +@copyright: 2000, 2001, 2002, 2004, 2006 James Troup +@license: GNU General Public License version 2 or later +""" # 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 @@ -21,25 +24,23 @@ ################################################################################ # 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. +# want that kind of horribleness in the otherwise generic 'dak +# make-overrides'. It does duplicate code tho. ################################################################################ -import pg, sys; -import utils, db_access; -import apt_pkg; +import os +import sys +import apt_pkg -################################################################################ - -Cnf = None; -projectB = None; -override = {} +from daklib.dbconn import * +from daklib.config import Config +from daklib import utils ################################################################################ def usage(exit_code=0): - print """Usage: denise + print """Usage: dak make-overrides Outputs the override tables to text files. -h, --help show this help and exit.""" @@ -47,80 +48,103 @@ Outputs the override tables to text files. ################################################################################ -def do_list(output_file, suite, component, otype): - global override; +def do_list(output_file, suite, component, otype, session): + """ + Fetch override data for suite from the database and dump it. + + @type output_file: fileobject + @param output_file: where to write the overrides to + + @type suite: Suite object + @param suite: A suite object describing the Suite - suite_id = db_access.get_suite_id(suite); - if suite_id == -1: - utils.fubar("Suite '%s' not recognised." % (suite)); + @type component: Component object + @param component: The name of the component - component_id = db_access.get_component_id(component); - if component_id == -1: - utils.fubar("Component '%s' not recognised." % (component)); + @type otype: OverrideType object + @param otype: object of type of override. deb/udeb/dsc - 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)); + @type session: SQLA Session + @param session: the database session in use - override.setdefault(suite, {}); - override[suite].setdefault(component, {}); - override[suite][component].setdefault(otype, {}); + """ + # Here's a nice example of why the object API isn't always the + # right answer. On my laptop, the object version of the code + # takes 1:45, the 'dumb' tuple-based one takes 0:16 - mhy + + if otype.overridetype == "dsc": + #q = session.query(Override).filter_by(suite_id = suite.suite_id) + #q = q.filter_by(component_id = component.component_id) + #q = q.filter_by(overridetype_id = otype.overridetype_id) + #q = q.join(Section).order_by(Section.section, Override.package) + #for o in q.all(): + # dat = (o.package, o.section.section, o.maintainer) + # output_file.write(utils.result_join(dat) + '\n') + q = session.execute("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.suite_id, component.component_id, otype.overridetype_id)) + for i in q.fetchall(): + output_file.write(utils.result_join(i) + '\n') - 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][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, otype_id)); - for i in q.getresult(): - i = i[:-1]; # Strip the priority level - override[suite][component][otype][i[0]] = i; - output_file.write(utils.result_join(i)+'\n'); + #q = session.query(Override).filter_by(suite_id = suite.suite_id) + #q = q.filter_by(component_id = component.component_id) + #q = q.filter_by(overridetype_id = otype.overridetype_id) + #q = q.join(Priority).join(Section).order_by(Section.section, Priority.level, Override.package) + #for o in q.all(): + # dat = (o.package, o.priority.priority, o.section.section, o.maintainer) + # output_file.write(utils.result_join(dat) + '\n') + q = session.execute("SELECT o.package, p.priority, s.section, o.maintainer 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.suite_id, component.component_id, otype.overridetype_id)) + for i in q.fetchall(): + output_file.write(utils.result_join(i) + '\n') ################################################################################ def main (): - global Cnf, projectB, override; - - Cnf = utils.get_conf() - Arguments = [('h',"help","Denise::Options::Help")]; + cnf = Config() + Arguments = [('h',"help","Make-Overrides::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 not cnf.has_key("Make-Overrides::Options::%s" % (i)): + cnf["Make-Overrides::Options::%s" % (i)] = "" + apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv) + Options = cnf.subtree("Make-Overrides::Options") if Options["Help"]: - usage(); + usage() - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); - db_access.init(Cnf, projectB); + d = DBConn() + session = d.session() - for suite in Cnf.SubTree("Cindy::OverrideSuites").List(): - if Cnf.has_key("Suite::%s::Untouchable" % suite) and Cnf["Suite::%s::Untouchable" % suite] != 0: + for suite in session.query(Suite).filter(Suite.overrideprocess==True): + if suite.untouchable: + print "Skipping %s as it is marked as untouchable" % suite.suite_name continue - suite = suite.lower() - - 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 otype in Cnf.ValueList("OverrideType"): - if otype == "deb": - suffix = ""; - elif otype == "udeb": - if component != "main": - continue; # Ick2 - 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(); + + sys.stderr.write("Processing %s...\n" % (suite.suite_name)) + override_suite = suite.overridecodename or suite.codename + + for component in session.query(Component).all(): + for otype in session.query(OverrideType).all(): + otype_name = otype.overridetype + cname = component.component_name + + # TODO: Stick suffix info in database (or get rid of it) + if otype_name == "deb": + suffix = "" + elif otype_name == "udeb": + if cname == "contrib": + continue # Ick2 + suffix = ".debian-installer" + elif otype_name == "dsc": + suffix = ".src" + else: + utils.fubar("Don't understand OverrideType %s" % otype.overridetype) + + cname = cname.replace('/', '_') + filename = os.path.join(cnf["Dir::Override"], "override.%s.%s%s" % (override_suite, cname, suffix)) + + output_file = utils.open_file(filename, 'w') + do_list(output_file, suite, component, otype, session) + output_file.close() ################################################################################ if __name__ == '__main__': - main(); + main()