X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_overrides.py;h=01eee0ed359646d7d13fbaa9792b72bebbe9e801;hb=55e563755c9f2a08950b2d46000ae8a800c5b579;hp=4015f2aeb0a76547eff627d350d7e68126015c9a;hpb=30413cf0ff7bc21b8d2b8b4346406357fe55dc19;p=dak.git diff --git a/dak/control_overrides.py b/dak/control_overrides.py index 4015f2ae..01eee0ed 100755 --- a/dak/control_overrides.py +++ b/dak/control_overrides.py @@ -1,8 +1,7 @@ #!/usr/bin/env python -# Manipulate override files -# Copyright (C) 2000, 2001, 2002, 2003 James Troup -# $Id: natalie,v 1.7 2005-11-15 09:50:32 ajt Exp $ +# Bulk manipulation of the overrides +# Copyright (C) 2000, 2001, 2002, 2003, 2006 James Troup # 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 @@ -51,8 +50,8 @@ ################################################################################ import pg, sys, time -import utils, db_access, logging import apt_pkg +import daklib.utils, daklib.database, daklib.logging ################################################################################ @@ -63,7 +62,7 @@ Logger = None ################################################################################ def usage (exit_code=0): - print """Usage: natalie.py [OPTIONS] + print """Usage: dak control-overrides [OPTIONS] -h, --help print this help and exit -c, --component=CMPT list/set overrides by component @@ -85,17 +84,17 @@ def usage (exit_code=0): ################################################################################ def process_file (file, suite, component, type, action): - suite_id = db_access.get_suite_id(suite) + suite_id = daklib.database.get_suite_id(suite) if suite_id == -1: - utils.fubar("Suite '%s' not recognised." % (suite)) + daklib.utils.fubar("Suite '%s' not recognised." % (suite)) - component_id = db_access.get_component_id(component) + component_id = daklib.database.get_component_id(component) if component_id == -1: - utils.fubar("Component '%s' not recognised." % (component)) + daklib.utils.fubar("Component '%s' not recognised." % (component)) - type_id = db_access.get_override_type_id(type) + type_id = daklib.database.get_override_type_id(type) if type_id == -1: - utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc.)" % (type)) + daklib.utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc.)" % (type)) # --set is done mostly internal for performance reasons; most # invocations of --set will be updates and making people wait 2-3 @@ -117,7 +116,7 @@ def process_file (file, suite, component, type, action): start_time = time.time() projectB.query("BEGIN WORK") for line in file.readlines(): - line = utils.re_comments.sub('', line).strip() + line = daklib.utils.re_comments.sub('', line).strip() if line == "": continue @@ -129,7 +128,7 @@ def process_file (file, suite, component, type, action): elif len(split_line) == 3: (package, section, maintainer_override) = split_line else: - utils.warn("'%s' does not break into 'package section [maintainer-override]'." % (line)) + daklib.utils.warn("'%s' does not break into 'package section [maintainer-override]'." % (line)) c_error += 1 continue priority = "source" @@ -140,23 +139,23 @@ def process_file (file, suite, component, type, action): elif len(split_line) == 4: (package, priority, section, maintainer_override) = split_line else: - utils.warn("'%s' does not break into 'package priority section [maintainer-override]'." % (line)) + daklib.utils.warn("'%s' does not break into 'package priority section [maintainer-override]'." % (line)) c_error += 1 continue - section_id = db_access.get_section_id(section) + section_id = daklib.database.get_section_id(section) if section_id == -1: - utils.warn("'%s' is not a valid section. ['%s' in suite %s, component %s]." % (section, package, suite, component)) + daklib.utils.warn("'%s' is not a valid section. ['%s' in suite %s, component %s]." % (section, package, suite, component)) c_error += 1 continue - priority_id = db_access.get_priority_id(priority) + priority_id = daklib.database.get_priority_id(priority) if priority_id == -1: - utils.warn("'%s' is not a valid priority. ['%s' in suite %s, component %s]." % (priority, package, suite, component)) + daklib.utils.warn("'%s' is not a valid priority. ['%s' in suite %s, component %s]." % (priority, package, suite, component)) c_error += 1 continue if new.has_key(package): - utils.warn("Can't insert duplicate entry for '%s'; ignoring all but the first. [suite %s, component %s]" % (package, suite, component)) + daklib.utils.warn("Can't insert duplicate entry for '%s'; ignoring all but the first. [suite %s, component %s]" % (package, suite, component)) c_error += 1 continue new[package] = "" @@ -207,84 +206,89 @@ def process_file (file, suite, component, type, action): Logger.log(["removed override",suite,component,type,package]) projectB.query("COMMIT WORK") - if not Cnf["Natalie::Options::Quiet"]: + if not Cnf["Control-Overrides::Options::Quiet"]: print "Done in %d seconds. [Updated = %d, Added = %d, Removed = %d, Skipped = %d, Errors = %d]" % (int(time.time()-start_time), c_updated, c_added, c_removed, c_skipped, c_error) Logger.log(["set complete",c_updated, c_added, c_removed, c_skipped, c_error]) ################################################################################ def list(suite, component, type): - suite_id = db_access.get_suite_id(suite) + suite_id = daklib.database.get_suite_id(suite) if suite_id == -1: - utils.fubar("Suite '%s' not recognised." % (suite)) + daklib.utils.fubar("Suite '%s' not recognised." % (suite)) - component_id = db_access.get_component_id(component) + component_id = daklib.database.get_component_id(component) if component_id == -1: - utils.fubar("Component '%s' not recognised." % (component)) + daklib.utils.fubar("Component '%s' not recognised." % (component)) - type_id = db_access.get_override_type_id(type) + type_id = daklib.database.get_override_type_id(type) if type_id == -1: - utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (type)) + daklib.utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (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)) for i in q.getresult(): - print utils.result_join(i) + print daklib.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(): - print utils.result_join(i[:-1]) + print daklib.utils.result_join(i[:-1]) ################################################################################ def main (): global Cnf, projectB, Logger - Cnf = utils.get_conf() - Arguments = [('a', "add", "Natalie::Options::Add"), - ('c', "component", "Natalie::Options::Component", "HasArg"), - ('h', "help", "Natalie::Options::Help"), - ('l', "list", "Natalie::Options::List"), - ('q', "quiet", "Natalie::Options::Quiet"), - ('s', "suite", "Natalie::Options::Suite", "HasArg"), - ('S', "set", "Natalie::Options::Set"), - ('t', "type", "Natalie::Options::Type", "HasArg")] + Cnf = daklib.utils.get_conf() + Arguments = [('a', "add", "Control-Overrides::Options::Add"), + ('c', "component", "Control-Overrides::Options::Component", "HasArg"), + ('h', "help", "Control-Overrides::Options::Help"), + ('l', "list", "Control-Overrides::Options::List"), + ('q', "quiet", "Control-Overrides::Options::Quiet"), + ('s', "suite", "Control-Overrides::Options::Suite", "HasArg"), + ('S', "set", "Control-Overrides::Options::Set"), + ('t', "type", "Control-Overrides::Options::Type", "HasArg")] # Default arguments for i in [ "add", "help", "list", "quiet", "set" ]: - if not Cnf.has_key("Natalie::Options::%s" % (i)): - Cnf["Natalie::Options::%s" % (i)] = "" - if not Cnf.has_key("Natalie::Options::Component"): - Cnf["Natalie::Options::Component"] = "main" - if not Cnf.has_key("Natalie::Options::Suite"): - Cnf["Natalie::Options::Suite"] = "unstable" - if not Cnf.has_key("Natalie::Options::Type"): - Cnf["Natalie::Options::Type"] = "deb" + if not Cnf.has_key("Control-Overrides::Options::%s" % (i)): + Cnf["Control-Overrides::Options::%s" % (i)] = "" + if not Cnf.has_key("Control-Overrides::Options::Component"): + Cnf["Control-Overrides::Options::Component"] = "main" + if not Cnf.has_key("Control-Overrides::Options::Suite"): + Cnf["Control-Overrides::Options::Suite"] = "unstable" + if not Cnf.has_key("Control-Overrides::Options::Type"): + Cnf["Control-Overrides::Options::Type"] = "deb" file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - if Cnf["Natalie::Options::Help"]: + if Cnf["Control-Overrides::Options::Help"]: usage() projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - db_access.init(Cnf, projectB) + daklib.database.init(Cnf, projectB) action = None for i in [ "add", "list", "set" ]: - if Cnf["Natalie::Options::%s" % (i)]: + if Cnf["Control-Overrides::Options::%s" % (i)]: if action: - utils.fubar("Can not perform more than one action at once.") + daklib.utils.fubar("Can not perform more than one action at once.") action = i - (suite, component, type) = (Cnf["Natalie::Options::Suite"], Cnf["Natalie::Options::Component"], Cnf["Natalie::Options::Type"]) + (suite, component, type) = (Cnf["Control-Overrides::Options::Suite"], + Cnf["Control-Overrides::Options::Component"], + Cnf["Control-Overrides::Options::Type"]) if action == "list": list(suite, component, type) else: - Logger = logging.Logger(Cnf, "natalie") + if Cnf.has_key("Suite::%s::Untouchable" % suite) and Cnf["Suite::%s::Untouchable" % suite] != 0: + daklib.utils.fubar("%s: suite is untouchable" % suite) + + Logger = daklib.logging.Logger(Cnf, "control-overrides") if file_list: for file in file_list: - process_file(utils.open_file(file), suite, component, type, action) + process_file(daklib.utils.open_file(file), suite, component, type, action) else: process_file(sys.stdin, suite, component, type, action) Logger.close()