X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Foverride.py;h=ce35d925ff978fca8bcb11ff06942c06a9e5ed19;hb=6d03dbb954cd67e522374c12225aa08a129e5d60;hp=1627474c064de049d091e2bfd460520300dc0d88;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git diff --git a/dak/override.py b/dak/override.py index 1627474c..ce35d925 100755 --- a/dak/override.py +++ b/dak/override.py @@ -1,8 +1,7 @@ #!/usr/bin/env python -# Microscopic modification and query tool for overrides in projectb -# Copyright (C) 2004 Daniel Silverstone -# $Id: alicia,v 1.6 2004-11-27 17:58:13 troup Exp $ +""" Microscopic modification and query tool for overrides in projectb """ +# Copyright (C) 2004, 2006 Daniel Silverstone # 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 @@ -26,28 +25,28 @@ ## That Alisha Rules The World ################################################################################ -import pg, sys; -import utils, db_access; -import apt_pkg, logging; +import os +import sys +import apt_pkg -################################################################################ - -Cnf = None; -projectB = None; +from daklib.config import Config +from daklib.dbconn import * +from daklib import daklog +from daklib import utils ################################################################################ -# Shamelessly stolen from melanie. Should probably end up in utils.py +# Shamelessly stolen from 'dak rm'. Should probably end up in utils.py def game_over(): - answer = utils.our_raw_input("Continue (y/N)? ").lower(); + answer = utils.our_raw_input("Continue (y/N)? ").lower() if answer != "y": print "Aborted." - sys.exit(1); + sys.exit(1) def usage (exit_code=0): - print """Usage: alicia [OPTIONS] package [section] [priority] -Make microchanges or microqueries of the overrides + print """Usage: dak override [OPTIONS] package [section] [priority] +Make microchanges or microqueries of the binary overrides -h, --help show this help and exit -d, --done=BUG# send priority/section change as closure to bug# @@ -57,192 +56,212 @@ Make microchanges or microqueries of the overrides sys.exit(exit_code) def main (): - global Cnf, projectB; + cnf = Config() - Cnf = utils.get_conf() - - Arguments = [('h',"help","Alicia::Options::Help"), - ('d',"done","Alicia::Options::Done", "HasArg"), - ('n',"no-action","Alicia::Options::No-Action"), - ('s',"suite","Alicia::Options::Suite", "HasArg"), - ]; + Arguments = [('h',"help","Override::Options::Help"), + ('d',"done","Override::Options::Done", "HasArg"), + ('n',"no-action","Override::Options::No-Action"), + ('s',"suite","Override::Options::Suite", "HasArg"), + ] for i in ["help", "no-action"]: - if not Cnf.has_key("Alicia::Options::%s" % (i)): - Cnf["Alicia::Options::%s" % (i)] = ""; - if not Cnf.has_key("Alicia::Options::Suite"): - Cnf["Alicia::Options::Suite"] = "unstable"; + if not cnf.has_key("Override::Options::%s" % (i)): + cnf["Override::Options::%s" % (i)] = "" + if not cnf.has_key("Override::Options::Suite"): + cnf["Override::Options::Suite"] = "unstable" - arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - Options = Cnf.SubTree("Alicia::Options") + arguments = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + Options = cnf.SubTree("Override::Options") if Options["Help"]: - usage(); + usage() - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); - db_access.init(Cnf, projectB); + session = DBConn().session() if not arguments: - utils.fubar("package name is a required argument."); + utils.fubar("package name is a required argument.") - package = arguments.pop(0); + package = arguments.pop(0) suite = Options["Suite"] if arguments and len(arguments) > 2: - utils.fubar("Too many arguments"); + utils.fubar("Too many arguments") if arguments and len(arguments) == 1: # Determine if the argument is a priority or a section... - arg = arguments.pop(); - q = projectB.query(""" - SELECT ( SELECT COUNT(*) FROM section WHERE section=%s ) AS secs, - ( SELECT COUNT(*) FROM priority WHERE priority=%s ) AS prios - """ % ( pg._quote(arg,"str"), pg._quote(arg,"str"))); - r = q.getresult(); + arg = arguments.pop() + q = session.execute(""" + SELECT ( SELECT COUNT(*) FROM section WHERE section = :arg ) AS secs, + ( SELECT COUNT(*) FROM priority WHERE priority = :arg ) AS prios + """, {'arg': arg}) + r = q.fetchall() if r[0][0] == 1: - arguments = (arg,"."); + arguments = (arg, ".") elif r[0][1] == 1: - arguments = (".",arg); + arguments = (".", arg) else: - utils.fubar("%s is not a valid section or priority" % (arg)); - + utils.fubar("%s is not a valid section or priority" % (arg)) # Retrieve current section/priority... - q = projectB.query(""" - SELECT priority.priority AS prio, section.section AS sect - FROM override, priority, section, suite + oldsection, oldsourcesection, oldpriority = None, None, None + for packagetype in ['source', 'binary']: + eqdsc = '!=' + if packagetype == 'source': + eqdsc = '=' + q = session.execute(""" + SELECT priority.priority AS prio, section.section AS sect, override_type.type AS type + FROM override, priority, section, suite, override_type WHERE override.priority = priority.id + AND override.type = override_type.id + AND override_type.type %s 'dsc' AND override.section = section.id - AND override.package = %s + AND override.package = :package AND override.suite = suite.id - AND suite.suite_name = %s - """ % (pg._quote(package,"str"), pg._quote(suite,"str"))); + AND suite.suite_name = :suite + """ % (eqdsc), {'package': package, 'suite': suite}) + + if q.rowcount == 0: + continue + if q.rowcount > 1: + utils.fubar("%s is ambiguous. Matches %d packages" % (package,q.ntuples())) + + r = q.fetchone() + if packagetype == 'binary': + oldsection = r[1] + oldpriority = r[0] + else: + oldsourcesection = r[1] + oldpriority = 'source' + + if not oldpriority and not oldsourcesection: + utils.fubar("Unable to find package %s" % (package)) - if q.ntuples() == 0: - utils.fubar("Unable to find package %s" % (package)); - if q.ntuples() > 1: - utils.fubar("%s is ambiguous. Matches %d packages" % (package,q.ntuples())); + if oldsection and oldsourcesection and oldsection != oldsourcesection: + # When setting overrides, both source & binary will become the same section + utils.warn("Source is in section '%s' instead of '%s'" % (oldsourcesection, oldsection)) - r = q.getresult(); - oldsection = r[0][1]; - oldpriority = r[0][0]; + if not oldsection: + oldsection = oldsourcesection if not arguments: print "%s is in section '%s' at priority '%s'" % ( - package,oldsection,oldpriority); - sys.exit(0); + package, oldsection, oldpriority) + sys.exit(0) # At this point, we have a new section and priority... check they're valid... - newsection, newpriority = arguments; + newsection, newpriority = arguments if newsection == ".": - newsection = oldsection; + newsection = oldsection if newpriority == ".": - newpriority = oldpriority; - - q = projectB.query("SELECT id FROM section WHERE section=%s" % ( - pg._quote(newsection,"str"))); - - if q.ntuples() == 0: - utils.fubar("Supplied section %s is invalid" % (newsection)); - newsecid = q.getresult()[0][0]; + newpriority = oldpriority - q = projectB.query("SELECT id FROM priority WHERE priority=%s" % ( - pg._quote(newpriority,"str"))); + s = get_section(newsection, session) + if s is None: + utils.fubar("Supplied section %s is invalid" % (newsection)) + newsecid = s.section_id - if q.ntuples() == 0: - utils.fubar("Supplied priority %s is invalid" % (newpriority)); - newprioid = q.getresult()[0][0]; + p = get_priority(newpriority, session) + if p is None: + utils.fubar("Supplied priority %s is invalid" % (newpriority)) + newprioid = p.priority_id if newpriority == oldpriority and newsection == oldsection: print "I: Doing nothing" - sys.exit(0); + sys.exit(0) + + if oldpriority == 'source' and newpriority != 'source': + utils.fubar("Trying to change priority of a source-only package") # If we're in no-action mode if Options["No-Action"]: if newpriority != oldpriority: - print "I: Would change priority from %s to %s" % (oldpriority,newpriority); + print "I: Would change priority from %s to %s" % (oldpriority,newpriority) if newsection != oldsection: - print "I: Would change section from %s to %s" % (oldsection,newsection); + print "I: Would change section from %s to %s" % (oldsection,newsection) if Options.has_key("Done"): - print "I: Would also close bug(s): %s" % (Options["Done"]); + print "I: Would also close bug(s): %s" % (Options["Done"]) - sys.exit(0); + sys.exit(0) if newpriority != oldpriority: - print "I: Will change priority from %s to %s" % (oldpriority,newpriority); + print "I: Will change priority from %s to %s" % (oldpriority,newpriority) + if newsection != oldsection: - print "I: Will change section from %s to %s" % (oldsection,newsection); + print "I: Will change section from %s to %s" % (oldsection,newsection) if not Options.has_key("Done"): - pass; - #utils.warn("No bugs to close have been specified. Noone will know you have done this."); + pass + #utils.warn("No bugs to close have been specified. Noone will know you have done this.") else: - print "I: Will close bug(s): %s" % (Options["Done"]); + print "I: Will close bug(s): %s" % (Options["Done"]) - game_over(); + game_over() - Logger = logging.Logger(Cnf, "alicia"); + Logger = daklog.Logger(cnf.Cnf, "override") - projectB.query("BEGIN WORK"); + dsc_otype_id = get_override_type('dsc').overridetype_id + + # We're already in a transaction # We're in "do it" mode, we have something to do... do it if newpriority != oldpriority: - q = projectB.query(""" + session.execute(""" UPDATE override - SET priority=%d - WHERE package=%s - AND suite = (SELECT id FROM suite WHERE suite_name=%s)""" % ( - newprioid, - pg._quote(package,"str"), - pg._quote(suite,"str") )); - Logger.log(["changed priority",package,oldpriority,newpriority]); + SET priority = :newprioid + WHERE package = :package + AND override.type != :otypedsc + AND suite = (SELECT id FROM suite WHERE suite_name = :suite)""", + {'newprioid': newprioid, 'package': package, + 'otypedsc': dsc_otype_id, 'suite': suite}) + + Logger.log(["changed priority", package, oldpriority, newpriority]) if newsection != oldsection: - q = projectB.query(""" + q = session.execute(""" UPDATE override - SET section=%d - WHERE package=%s - AND suite = (SELECT id FROM suite WHERE suite_name=%s)""" % ( - newsecid, - pg._quote(package,"str"), - pg._quote(suite,"str") )); - Logger.log(["changed priority",package,oldsection,newsection]); - projectB.query("COMMIT WORK"); + SET section = :newsecid + WHERE package = :package + AND suite = (SELECT id FROM suite WHERE suite_name = :suite)""", + {'newsecid': newsecid, 'package': package, + 'suite': suite}) + + Logger.log(["changed section", package, oldsection, newsection]) + + session.commit() if Options.has_key("Done"): - Subst = {}; - Subst["__ALICIA_ADDRESS__"] = Cnf["Alicia::MyEmailAddress"]; - Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"]; - bcc = []; - if Cnf.Find("Dinstall::Bcc") != "": - bcc.append(Cnf["Dinstall::Bcc"]); - if Cnf.Find("Alicia::Bcc") != "": - bcc.append(Cnf["Alicia::Bcc"]); + Subst = {} + Subst["__OVERRIDE_ADDRESS__"] = cnf["Override::MyEmailAddress"] + Subst["__BUG_SERVER__"] = cnf["Dinstall::BugServer"] + bcc = [] + if cnf.Find("Dinstall::Bcc") != "": + bcc.append(cnf["Dinstall::Bcc"]) + if cnf.Find("Override::Bcc") != "": + bcc.append(cnf["Override::Bcc"]) if bcc: - Subst["__BCC__"] = "Bcc: " + ", ".join(bcc); + Subst["__BCC__"] = "Bcc: " + ", ".join(bcc) else: - Subst["__BCC__"] = "X-Filler: 42"; - Subst["__CC__"] = "X-Katie: alicia $Revision: 1.6 $"; - Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]; - Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]; - Subst["__WHOAMI__"] = utils.whoami(); - - summary = "Concerning package %s...\n" % (package); - summary += "Operating on the %s suite\n" % (suite); + Subst["__BCC__"] = "X-Filler: 42" + Subst["__CC__"] = "Cc: " + package + "@" + cnf["Dinstall::PackagesServer"] + "\nX-DAK: dak override" + Subst["__ADMIN_ADDRESS__"] = cnf["Dinstall::MyAdminAddress"] + Subst["__DISTRO__"] = cnf["Dinstall::MyDistribution"] + Subst["__WHOAMI__"] = utils.whoami() + Subst["__SOURCE__"] = package + + summary = "Concerning package %s...\n" % (package) + summary += "Operating on the %s suite\n" % (suite) if newpriority != oldpriority: - summary += "Changed priority from %s to %s\n" % (oldpriority,newpriority); + summary += "Changed priority from %s to %s\n" % (oldpriority,newpriority) if newsection != oldsection: - summary += "Changed section from %s to %s\n" % (oldsection,newsection); - Subst["__SUMMARY__"] = summary; + summary += "Changed section from %s to %s\n" % (oldsection,newsection) + Subst["__SUMMARY__"] = summary + template = os.path.join(cnf["Dir::Templates"], "override.bug-close") for bug in utils.split_args(Options["Done"]): - Subst["__BUG_NUMBER__"] = bug; - mail_message = utils.TemplateSubst( - Subst,Cnf["Dir::Templates"]+"/alicia.bug-close"); - utils.send_mail(mail_message); - Logger.log(["closed bug",bug]); - - Logger.close(); + Subst["__BUG_NUMBER__"] = bug + mail_message = utils.TemplateSubst(Subst, template) + utils.send_mail(mail_message) + Logger.log(["closed bug", bug]) - print "Done"; + Logger.close() #################################################################################