X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=dak%2Foverride.py;h=1d43a62579fe08012426cb5dcd1fc2d435c50883;hp=4b92ae1105bf989eef06e41642c674de29c3de49;hb=98d086ddda3772fb58c1bfa97478e8044596b569;hpb=6a4cddfbe864e563e671fe5dabf5600c4783af5c diff --git a/dak/override.py b/dak/override.py index 4b92ae11..1d43a625 100755 --- a/dak/override.py +++ b/dak/override.py @@ -25,16 +25,14 @@ ## That Alisha Rules The World ################################################################################ -import pg, sys +import os +import sys import apt_pkg -from daklib import logging -from daklib import database -from daklib import utils - -################################################################################ -Cnf = None -projectB = None +from daklib.config import Config +from daklib.dbconn import * +from daklib import daklog +from daklib import utils ################################################################################ @@ -51,57 +49,113 @@ def usage (exit_code=0): Make microchanges or microqueries of the binary overrides -h, --help show this help and exit + -c, --check check override compliance -d, --done=BUG# send priority/section change as closure to bug# -n, --no-action don't do anything -s, --suite specify the suite to use """ sys.exit(exit_code) -def main (): - global Cnf, projectB +def check_override_compliance(package, priority, archive_path, suite_name, cnf, session): + print "Checking compliance with related overrides..." + + depends = set() + rdepends = set() + components = get_component_names(session) + arches = set([x.arch_string for x in get_suite_architectures(suite_name)]) + arches -= set(["source", "all"]) + for arch in arches: + for component in components: + Packages = utils.get_packages_from_ftp(archive_path, suite_name, component, arch) + while Packages.step(): + package_name = Packages.section.find("Package") + dep_list = Packages.section.find("Depends") + if dep_list: + if package_name == package: + for d in apt_pkg.parse_depends(dep_list): + for i in d: + depends.add(i[0]) + else: + for d in apt_pkg.parse_depends(dep_list): + for i in d: + if i[0] == package: + rdepends.add(package_name) + + query = """SELECT o.package, p.level, p.priority + FROM override o + JOIN suite s ON s.id = o.suite + JOIN priority p ON p.id = o.priority + WHERE s.suite_name = '%s' + AND o.package in ('%s')""" \ + % (suite_name, "', '".join(depends.union(rdepends))) + packages = session.execute(query) + + excuses = [] + for p in packages: + if p[0] == package or not p[1]: + continue + if p[0] in depends: + if priority.level < p[1]: + excuses.append("%s would have priority %s, its dependency %s has priority %s" \ + % (package, priority.priority, p[0], p[2])) + if p[0] in rdepends: + if priority.level > p[1]: + excuses.append("%s would have priority %s, its reverse dependency %s has priority %s" \ + % (package, priority.priority, p[0], p[2])) + + if excuses: + for ex in excuses: + print ex + else: + print "Proposed override change complies with Debian Policy" - Cnf = utils.get_conf() +def main (): + cnf = Config() Arguments = [('h',"help","Override::Options::Help"), + ('c',"check","Override::Options::Check"), ('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("Override::Options::%s" % (i)): - Cnf["Override::Options::%s" % (i)] = "" - if not Cnf.has_key("Override::Options::Suite"): - Cnf["Override::Options::Suite"] = "unstable" + for i in ["help", "check", "no-action"]: + 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("Override::Options") + arguments = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv) + Options = cnf.subtree("Override::Options") if Options["Help"]: usage() - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - database.init(Cnf, projectB) + session = DBConn().session() if not arguments: utils.fubar("package name is a required argument.") package = arguments.pop(0) - suite = Options["Suite"] + suite_name = Options["Suite"] if arguments and len(arguments) > 2: utils.fubar("Too many arguments") + suite = get_suite(suite_name, session) + if suite is None: + utils.fubar("Unknown suite '{0}'".format(suite_name)) + 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() + 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)) @@ -111,42 +165,44 @@ def main (): eqdsc = '!=' if packagetype == 'source': eqdsc = '=' - q = projectB.query(""" + 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 - """ % (eqdsc, pg._quote(package,"str"), pg._quote(suite,"str"))) + AND suite.suite_name = :suite_name + """ % (eqdsc), {'package': package, 'suite_name': suite_name}) - if q.ntuples() == 0: + if q.rowcount == 0: continue - if q.ntuples() > 1: - utils.fubar("%s is ambiguous. Matches %d packages" % (package,q.ntuples())) + if q.rowcount > 1: + utils.fubar("%s is ambiguous. Matches %d packages" % (package,q.rowcount)) - r = q.getresult() + r = q.fetchone() if packagetype == 'binary': - oldsection = r[0][1] - oldpriority = r[0][0] + oldsection = r[1] + oldpriority = r[0] else: - oldsourcesection = r[0][1] + oldsourcesection = r[1] oldpriority = 'source' if not oldpriority and not oldsourcesection: utils.fubar("Unable to find package %s" % (package)) + 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)) + if not oldsection: oldsection = oldsourcesection if not arguments: print "%s is in section '%s' at priority '%s'" % ( - package,oldsection,oldpriority) + package, oldsection, oldpriority) sys.exit(0) # At this point, we have a new section and priority... check they're valid... @@ -157,19 +213,15 @@ def main (): if newpriority == ".": newpriority = oldpriority - q = projectB.query("SELECT id FROM section WHERE section=%s" % ( - pg._quote(newsection,"str"))) - - if q.ntuples() == 0: + s = get_section(newsection, session) + if s is None: utils.fubar("Supplied section %s is invalid" % (newsection)) - newsecid = q.getresult()[0][0] - - q = projectB.query("SELECT id FROM priority WHERE priority=%s" % ( - pg._quote(newpriority,"str"))) + newsecid = s.section_id - if q.ntuples() == 0: + p = get_priority(newpriority, session) + if p is None: utils.fubar("Supplied priority %s is invalid" % (newpriority)) - newprioid = q.getresult()[0][0] + newprioid = p.priority_id if newpriority == oldpriority and newsection == oldsection: print "I: Doing nothing" @@ -178,6 +230,9 @@ def main (): if oldpriority == 'source' and newpriority != 'source': utils.fubar("Trying to change priority of a source-only package") + if Options["Check"] and newpriority != oldpriority: + check_override_compliance(package, p, suite.archive.path, suite_name, cnf, session) + # If we're in no-action mode if Options["No-Action"]: if newpriority != oldpriority: @@ -191,6 +246,7 @@ def main (): if newpriority != oldpriority: 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) @@ -202,72 +258,79 @@ def main (): game_over() - Logger = logging.Logger(Cnf, "override") + Logger = daklog.Logger("override") + + dsc_otype_id = get_override_type('dsc').overridetype_id - projectB.query("BEGIN WORK") + # 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 override.type != %d - AND suite = (SELECT id FROM suite WHERE suite_name=%s)""" % ( - newprioid, - pg._quote(package,"str"), database.get_override_type_id("dsc"), - 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_name)""", + {'newprioid': newprioid, 'package': package, + 'otypedsc': dsc_otype_id, 'suite_name': suite_name}) + + 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 section",package,oldsection,newsection]) - projectB.query("COMMIT WORK") + SET section = :newsecid + WHERE package = :package + AND suite = (SELECT id FROM suite WHERE suite_name = :suite_name)""", + {'newsecid': newsecid, 'package': package, + 'suite_name': suite_name}) + + Logger.log(["changed section", package, oldsection, newsection]) + + session.commit() if Options.has_key("Done"): + if not cnf.has_key("Dinstall::BugServer"): + utils.warn("Asked to send Done message but Dinstall::BugServer is not configured") + Logger.close() + return + Subst = {} - Subst["__OVERRIDE_ADDRESS__"] = Cnf["Override::MyEmailAddress"] - Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"] + Subst["__OVERRIDE_ADDRESS__"] = cnf["Dinstall::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 cnf.find("Dinstall::Bcc") != "": + bcc.append(cnf["Dinstall::Bcc"]) if bcc: Subst["__BCC__"] = "Bcc: " + ", ".join(bcc) else: Subst["__BCC__"] = "X-Filler: 42" - Subst["__CC__"] = "X-DAK: dak override\nX-Katie: alicia" - Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"] - Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"] + if cnf.has_key("Dinstall::PackagesServer"): + Subst["__CC__"] = "Cc: " + package + "@" + cnf["Dinstall::PackagesServer"] + "\nX-DAK: dak override" + else: + Subst["__CC__"] = "X-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) + summary += "Operating on the %s suite\n" % (suite_name) if newpriority != oldpriority: 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 + 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"]+"/override.bug-close") + mail_message = utils.TemplateSubst(Subst, template) utils.send_mail(mail_message) - Logger.log(["closed bug",bug]) + Logger.log(["closed bug", bug]) Logger.close() - print "Done" - ################################################################################# if __name__ == '__main__':