X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=natalie.py;h=3cf44fea379648fd60f5370155dd2b577fc580ab;hb=fa8bfae9f3c67cd505958a910022c9d04ce5d004;hp=267a52f582e72b688ba5092be29e76f37d052cf6;hpb=d52ebffcc7af210985d90ffc58e7ecc4141dd8a8;p=dak.git diff --git a/natalie.py b/natalie.py index 267a52f5..3cf44fea 100755 --- a/natalie.py +++ b/natalie.py @@ -2,7 +2,7 @@ # Manipulate override files # Copyright (C) 2000, 2001 James Troup -# $Id: natalie.py,v 1.3 2001-03-02 02:24:33 troup Exp $ +# $Id: natalie.py,v 1.7 2001-07-25 16:01:02 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 @@ -20,14 +20,15 @@ ################################################################################ -import pg, string, sys, time -import utils, db_access +import errno, os, pg, pwd, string, sys, time; +import utils, db_access, logging; import apt_pkg; ################################################################################ Cnf = None; projectB = None; +Logger = None; ################################################################################ @@ -50,27 +51,24 @@ def usage (exit_code): ################################################################################ -def init(): +def init (): global projectB; - projectB = pg.connect('projectb', 'localhost'); + projectB = pg.connect('projectb', None); db_access.init(Cnf, projectB); -def process_file (file, suite, component, type, action): +def process_file (file, suite, component, type): 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)); # --set is done mostly internal for performance reasons; most # invocations of --set will be updates and making people wait 2-3 @@ -84,7 +82,7 @@ def process_file (file, suite, component, type, action): c_removed = 0; c_error = 0; - q = projectB.query("SELECT package, priority, section, maintainer FROM override WHERE suite = %s AND component = %s AND type = %s" + q = projectB.query("SELECT o.package, o.priority, o.section, o.maintainer, p.priority, s.section 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" % (suite_id, component_id, type_id)); for i in q.getresult(): original[i[0]] = i[1:]; @@ -104,7 +102,7 @@ def process_file (file, suite, component, type, action): elif len(split_line) == 3: (package, section, maintainer_override) = split_line; else: - sys.stderr.write("W: '%s' does not break into 'package section [maintainer override]'.\n" % (line)); + utils.warn("'%s' does not break into 'package section [maintainer-override]'." % (line)); c_error = c_error + 1; continue; priority = "source"; @@ -115,28 +113,28 @@ def process_file (file, suite, component, type, action): elif len(split_line) == 4: (package, priority, section, maintainer_override) = split_line; else: - sys.stderr.write("W: '%s' does not break into 'package priority section [maintainer override]'.\n" % (line)); + utils.warn("'%s' does not break into 'package priority section [maintainer-override]'." % (line)); c_error = c_error + 1; continue; section_id = db_access.get_section_id(section); if section_id == -1: - sys.stderr.write("W: '%s' is not a valid section. ['%s' in suite %s, component %s].\n" % (section, package, suite, component)); + utils.warn("'%s' is not a valid section. ['%s' in suite %s, component %s]." % (section, package, suite, component)); c_error = c_error + 1; continue; priority_id = db_access.get_priority_id(priority); if priority_id == -1: - sys.stderr.write("W: '%s' is not a valid priority. ['%s' in suite %s, component %s].\n" % (priority, package, suite, component)); + utils.warn("'%s' is not a valid priority. ['%s' in suite %s, component %s]." % (priority, package, suite, component)); c_error = c_error + 1; continue; if new.has_key(package): - sys.stderr.write("W: Can't insert duplicate entry for '%s'; ignoring all but the first. [suite %s, component %s]\n" % (package, suite, component)); + utils.warn("Can't insert duplicate entry for '%s'; ignoring all but the first. [suite %s, component %s]" % (package, suite, component)); c_error = c_error + 1; continue; new[package] = ""; if original.has_key(package): - (old_priority_id, old_section_id, old_maintainer_override) = original[package]; + (old_priority_id, old_section_id, old_maintainer_override, old_priority, old_section) = original[package]; if old_priority_id == priority_id and old_section_id == section_id and old_maintainer_override == maintainer_override: # Same? Ignore it c_skipped = c_skipped + 1; @@ -146,8 +144,17 @@ def process_file (file, suite, component, type, action): c_updated = c_updated + 1; projectB.query("DELETE FROM override WHERE suite = %s AND component = %s AND package = '%s' AND type = %s" % (suite_id, component_id, package, type_id)); + # Log changes + if old_priority_id != priority_id: + Logger.log(["changed priority",package,old_priority,priority]); + if old_section_id != section_id: + Logger.log(["changed section",package,old_section,section]); + if old_maintainer_override != maintainer_override: + Logger.log(["changed maintainer override",package,old_maintainer_override,maintainer_override]); + update_p = 1; else: c_added = c_added + 1; + update_p = 0; if maintainer_override: projectB.query("INSERT INTO override (suite, component, type, package, priority, section, maintainer) VALUES (%s, %s, %s, '%s', %s, %s, '%s')" @@ -156,6 +163,8 @@ def process_file (file, suite, component, type, action): projectB.query("INSERT INTO override (suite, component, type, package, priority, section) VALUES (%s, %s, %s, '%s', %s, %s)" % (suite_id, component_id, type_id, package, priority_id, section_id)); + if not update_p: + Logger.log(["new override",suite,component,type,package,priority,section,maintainer_override]); # Delete any packages which were removed for package in original.keys(): @@ -163,27 +172,26 @@ def process_file (file, suite, component, type, action): projectB.query("DELETE FROM override WHERE suite = %s AND component = %s AND package = '%s' AND type = %s" % (suite_id, component_id, package, type_id)); c_removed = c_removed + 1; + Logger.log(["removed override",suite,component,type,package]); projectB.query("COMMIT WORK"); 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); 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 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)); @@ -197,7 +205,7 @@ def list(suite, component, type): ################################################################################ def main (): - global Cnf, projectB; + global Cnf, projectB, Logger; apt_pkg.init(); @@ -222,8 +230,7 @@ def main (): for i in [ "list", "set" ]: if Cnf["Natalie::Options::%s" % (i)]: if action != None: - sys.stderr.write("Can not perform more than one action at once.\n"); - sys.exit(2); + 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"]) @@ -231,11 +238,13 @@ def main (): if action == "list": list(suite, component, type); else: + Logger = logging.Logger(Cnf, "natalie"); if file_list != []: for file in file_list: - process_file(utils.open_file(file,'r'), suite, component, type, action); + process_file(utils.open_file(file,'r'), suite, component, type); else: - process_file(sys.stdin, suite, component, type, action); + process_file(sys.stdin, suite, component, type); + Logger.close(); #######################################################################################