X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=ba6e030a0d969160f4f3a9fb308874f582b437ab;hb=8f8d647c323f40bb9ccbf6ca4b4f42fe470b78d8;hp=262039bf51a6174130b11a175ab66994ef710aa4;hpb=06b17e68fd4a76e7a12f741f26654e55bff05c79;p=dak.git diff --git a/dak/rm.py b/dak/rm.py old mode 100644 new mode 100755 index 262039bf..ba6e030a --- a/dak/rm.py +++ b/dak/rm.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# General purpose package removal tool for ftpmaster +""" General purpose package removal tool for ftpmaster """ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006 James Troup # This program is free software; you can redistribute it and/or modify @@ -39,21 +39,21 @@ ################################################################################ -import commands, os, pg, re, sys -import apt_pkg, apt_inst -import daklib.database -import daklib.utils +import commands +import os +import sys +import apt_pkg +import apt_inst -################################################################################ - -re_strip_source_version = re.compile (r'\s+.*$') -re_build_dep_arch = re.compile(r"\[[^]]+\]") +from daklib.config import Config +from daklib.dbconn import * +from daklib import utils +from daklib.dak_exceptions import * +from daklib.regexes import re_strip_source_version, re_build_dep_arch ################################################################################ -Cnf = None Options = None -projectB = None ################################################################################ @@ -87,34 +87,47 @@ ARCH, BUG#, COMPONENT and SUITE can be comma (or space) separated lists, e.g. # the fuck are we gonna do now? What are we gonna do?" def game_over(): - answer = daklib.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) ################################################################################ -def reverse_depends_check(removals, suites): +def reverse_depends_check(removals, suites, arches=None): + cnf = Config() + print "Checking reverse dependencies..." - components = Cnf.ValueList("Suite::%s::Components" % suites[0]) + components = cnf.ValueList("Suite::%s::Components" % suites[0]) dep_problem = 0 p2c = {} - for architecture in Cnf.ValueList("Suite::%s::Architectures" % suites[0]): - if architecture in ["source", "all"]: - continue + all_broken = {} + if arches: + all_arches = set(arches) + else: + all_arches = set([x.arch_string for x in get_suite_architectures(suites[0])]) + all_arches -= set(["source", "all"]) + for architecture in all_arches: deps = {} + sources = {} virtual_packages = {} for component in components: - filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (Cnf["Dir::Root"], suites[0], component, architecture) + filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (cnf["Dir::Root"], suites[0], component, architecture) # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - temp_filename = daklib.utils.temp_filename() + (fd, temp_filename) = utils.temp_filename() (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename)) if (result != 0): - daklib.utils.fubar("Gunzip invocation failed!\n%s\n" % (output), result) - packages = daklib.utils.open_file(temp_filename) + utils.fubar("Gunzip invocation failed!\n%s\n" % (output), result) + packages = utils.open_file(temp_filename) Packages = apt_pkg.ParseTagFile(packages) while Packages.Step(): package = Packages.Section.Find("Package") + source = Packages.Section.Find("Source") + if not source: + source = package + elif ' ' in source: + source = source.split(' ', 1)[0] + sources[package] = source depends = Packages.Section.Find("Depends") if depends: deps[package] = depends @@ -161,23 +174,37 @@ def reverse_depends_check(removals, suites): unsat += 1 if unsat == len(dep): component = p2c[package] + source = sources[package] if component != "main": - what = "%s/%s" % (package, component) - else: - what = "** %s" % (package) - print "%s has an unsatisfied dependency on %s: %s" % (what, architecture, daklib.utils.pp_deps(dep)) + source = "%s/%s" % (source, component) + all_broken.setdefault(source, {}).setdefault(package, set()).add(architecture) dep_problem = 1 + if all_broken: + print "# Broken Depends:" + for source, bindict in sorted(all_broken.items()): + lines = [] + for binary, arches in sorted(bindict.items()): + if arches == all_arches: + lines.append(binary) + else: + lines.append('%s [%s]' % (binary, ' '.join(sorted(arches)))) + print '%s: %s' % (source, lines[0]) + for line in lines[1:]: + print ' ' * (len(source) + 2) + line + print + # Check source dependencies (Build-Depends and Build-Depends-Indep) + all_broken.clear() for component in components: - filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suites[0], component) + filename = "%s/dists/%s/%s/source/Sources.gz" % (cnf["Dir::Root"], suites[0], component) # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - temp_filename = daklib.utils.temp_filename() + (fd, temp_filename) = utils.temp_filename() result, output = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename)) if result != 0: sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output)) sys.exit(result) - sources = daklib.utils.open_file(temp_filename, "r") + sources = utils.open_file(temp_filename, "r") Sources = apt_pkg.ParseTagFile(sources) while Sources.Step(): source = Sources.Section.Find("Package") @@ -200,13 +227,20 @@ def reverse_depends_check(removals, suites): if unsat == len(dep): if component != "main": source = "%s/%s" % (source, component) - else: - source = "** %s" % (source) - print "%s has an unsatisfied build-dependency: %s" % (source, daklib.utils.pp_deps(dep)) + all_broken.setdefault(source, set()).add(utils.pp_deps(dep)) dep_problem = 1 sources.close() os.unlink(temp_filename) + if all_broken: + print "# Broken Build-Depends:" + for source, bdeps in sorted(all_broken.items()): + bdeps = sorted(bdeps) + print '%s: %s' % (source, bdeps[0]) + for bdep in bdeps[1:]: + print ' ' * (len(source) + 2) + bdep + print + if dep_problem: print "Dependency problem found." if not Options["No-Action"]: @@ -218,9 +252,9 @@ def reverse_depends_check(removals, suites): ################################################################################ def main (): - global Cnf, Options, projectB + global Options - Cnf = daklib.utils.get_conf() + cnf = Config() Arguments = [('h',"help","Rm::Options::Help"), ('a',"architecture","Rm::Options::Architecture", "HasArg"), @@ -239,31 +273,30 @@ def main (): for i in [ "architecture", "binary-only", "carbon-copy", "component", "done", "help", "no-action", "partial", "rdep-check", "reason", "source-only" ]: - if not Cnf.has_key("Rm::Options::%s" % (i)): - Cnf["Rm::Options::%s" % (i)] = "" - if not Cnf.has_key("Rm::Options::Suite"): - Cnf["Rm::Options::Suite"] = "unstable" + if not cnf.has_key("Rm::Options::%s" % (i)): + cnf["Rm::Options::%s" % (i)] = "" + if not cnf.has_key("Rm::Options::Suite"): + cnf["Rm::Options::Suite"] = "unstable" - arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Rm::Options") + arguments = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + Options = cnf.SubTree("Rm::Options") if Options["Help"]: usage() - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - daklib.database.init(Cnf, projectB) + session = DBConn().session() # Sanity check options if not arguments: - daklib.utils.fubar("need at least one package name as an argument.") + utils.fubar("need at least one package name as an argument.") if Options["Architecture"] and Options["Source-Only"]: - daklib.utils.fubar("can't use -a/--architecutre and -S/--source-only options simultaneously.") + utils.fubar("can't use -a/--architecture and -S/--source-only options simultaneously.") if Options["Binary-Only"] and Options["Source-Only"]: - daklib.utils.fubar("can't use -b/--binary-only and -S/--source-only options simultaneously.") + utils.fubar("can't use -b/--binary-only and -S/--source-only options simultaneously.") if Options.has_key("Carbon-Copy") and not Options.has_key("Done"): - daklib.utils.fubar("can't use -C/--carbon-copy without also using -d/--done option.") + utils.fubar("can't use -C/--carbon-copy without also using -d/--done option.") if Options["Architecture"] and not Options["Partial"]: - daklib.utils.warn("-a/--architecture implies -p/--partial.") + utils.warn("-a/--architecture implies -p/--partial.") Options["Partial"] = "true" # Force the admin to tell someone if we're not doing a 'dak @@ -271,7 +304,7 @@ def main (): # as telling someone). if not Options["No-Action"] and not Options["Carbon-Copy"] \ and not Options["Done"] and Options["Reason"].find("[auto-cruft]") == -1: - daklib.utils.fubar("Need a -C/--carbon-copy if not closing a bug and not doing a cruft removal.") + utils.fubar("Need a -C/--carbon-copy if not closing a bug and not doing a cruft removal.") # Process -C/--carbon-copy # @@ -281,18 +314,18 @@ def main (): # 3) contains a '@' - assumed to be an email address, used unmofidied # carbon_copy = [] - for copy_to in daklib.utils.split_args(Options.get("Carbon-Copy")): + for copy_to in utils.split_args(Options.get("Carbon-Copy")): if copy_to.isdigit(): - carbon_copy.append(copy_to + "@" + Cnf["Dinstall::BugServer"]) + carbon_copy.append(copy_to + "@" + cnf["Dinstall::BugServer"]) elif copy_to == 'package': for package in arguments: - carbon_copy.append(package + "@" + Cnf["Dinstall::PackagesServer"]) - if Cnf.has_key("Dinstall::TrackingServer"): - carbon_copy.append(package + "@" + Cnf["Dinstall::TrackingServer"]) + carbon_copy.append(package + "@" + cnf["Dinstall::PackagesServer"]) + if cnf.has_key("Dinstall::TrackingServer"): + carbon_copy.append(package + "@" + cnf["Dinstall::TrackingServer"]) elif '@' in copy_to: carbon_copy.append(copy_to) else: - daklib.utils.fubar("Invalid -C/--carbon-copy argument '%s'; not a bug number, 'package' or email address." % (copy_to)) + utils.fubar("Invalid -C/--carbon-copy argument '%s'; not a bug number, 'package' or email address." % (copy_to)) if Options["Binary-Only"]: field = "b.package" @@ -301,17 +334,17 @@ def main (): con_packages = "AND %s IN (%s)" % (field, ", ".join([ repr(i) for i in arguments ])) (con_suites, con_architectures, con_components, check_source) = \ - daklib.utils.parse_args(Options) + utils.parse_args(Options) # Additional suite checks suite_ids_list = [] - suites = daklib.utils.split_args(Options["Suite"]) - suites_list = daklib.utils.join_with_commas_and(suites) + suites = utils.split_args(Options["Suite"]) + suites_list = utils.join_with_commas_and(suites) if not Options["No-Action"]: for suite in suites: - suite_id = daklib.database.get_suite_id(suite) - if suite_id != -1: - suite_ids_list.append(suite_id) + s = get_suite(suite, session=session) + if s is not None: + suite_ids_list.append(s.suite_id) if suite == "stable": print "**WARNING** About to remove from the stable suite!" print "This should only be done just prior to a (point) release and not at" @@ -325,7 +358,7 @@ def main (): # Additional architecture checks if Options["Architecture"] and check_source: - daklib.utils.warn("'source' in -a/--argument makes no sense and is ignored.") + utils.warn("'source' in -a/--argument makes no sense and is ignored.") # Additional component processing over_con_components = con_components.replace("c.id", "component") @@ -340,32 +373,35 @@ def main (): # latter is a nasty mess, but very nice from a UI perspective so # we try to support it. + # XXX: TODO: This all needs converting to use placeholders or the object + # API. It's an SQL injection dream at the moment + if Options["Binary-Only"]: # Binary-only - q = projectB.query("SELECT b.package, b.version, a.arch_string, b.id, b.maintainer FROM binaries b, bin_associations ba, architecture a, suite su, files f, location l, component c WHERE ba.bin = b.id AND ba.suite = su.id AND b.architecture = a.id AND b.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s %s" % (con_packages, con_suites, con_components, con_architectures)) - for i in q.getresult(): + q = session.execute("SELECT b.package, b.version, a.arch_string, b.id, b.maintainer FROM binaries b, bin_associations ba, architecture a, suite su, files f, location l, component c WHERE ba.bin = b.id AND ba.suite = su.id AND b.architecture = a.id AND b.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s %s" % (con_packages, con_suites, con_components, con_architectures)) + for i in q.fetchall(): to_remove.append(i) else: # Source-only source_packages = {} - q = projectB.query("SELECT l.path, f.filename, s.source, s.version, 'source', s.id, s.maintainer FROM source s, src_associations sa, suite su, files f, location l, component c WHERE sa.source = s.id AND sa.suite = su.id AND s.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s" % (con_packages, con_suites, con_components)) - for i in q.getresult(): + q = session.execute("SELECT l.path, f.filename, s.source, s.version, 'source', s.id, s.maintainer FROM source s, src_associations sa, suite su, files f, location l, component c WHERE sa.source = s.id AND sa.suite = su.id AND s.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s" % (con_packages, con_suites, con_components)) + for i in q.fetchall(): source_packages[i[2]] = i[:2] to_remove.append(i[2:]) if not Options["Source-Only"]: # Source + Binary binary_packages = {} # First get a list of binary package names we suspect are linked to the source - q = projectB.query("SELECT DISTINCT b.package FROM binaries b, source s, src_associations sa, suite su, files f, location l, component c WHERE b.source = s.id AND sa.source = s.id AND sa.suite = su.id AND s.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s" % (con_packages, con_suites, con_components)) - for i in q.getresult(): + q = session.execute("SELECT DISTINCT b.package FROM binaries b, source s, src_associations sa, suite su, files f, location l, component c WHERE b.source = s.id AND sa.source = s.id AND sa.suite = su.id AND s.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s" % (con_packages, con_suites, con_components)) + for i in q.fetchall(): binary_packages[i[0]] = "" # Then parse each .dsc that we found earlier to see what binary packages it thinks it produces for i in source_packages.keys(): filename = "/".join(source_packages[i]) try: - dsc = daklib.utils.parse_changes(filename) - except daklib.utils.cant_open_exc: - daklib.utils.warn("couldn't open '%s'." % (filename)) + dsc = utils.parse_changes(filename) + except CantOpenError: + utils.warn("couldn't open '%s'." % (filename)) continue for package in dsc.get("binary").split(','): package = package.strip() @@ -375,10 +411,10 @@ def main (): # source package and if so add it to the list of packages # to be removed. for package in binary_packages.keys(): - q = projectB.query("SELECT l.path, f.filename, b.package, b.version, a.arch_string, b.id, b.maintainer FROM binaries b, bin_associations ba, architecture a, suite su, files f, location l, component c WHERE ba.bin = b.id AND ba.suite = su.id AND b.architecture = a.id AND b.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s AND b.package = '%s'" % (con_suites, con_components, con_architectures, package)) - for i in q.getresult(): + q = session.execute("SELECT l.path, f.filename, b.package, b.version, a.arch_string, b.id, b.maintainer FROM binaries b, bin_associations ba, architecture a, suite su, files f, location l, component c WHERE ba.bin = b.id AND ba.suite = su.id AND b.architecture = a.id AND b.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s AND b.package = '%s'" % (con_suites, con_components, con_architectures, package)) + for i in q.fetchall(): filename = "/".join(i[:2]) - control = apt_pkg.ParseSection(apt_inst.debExtractControl(daklib.utils.open_file(filename))) + control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(filename))) source = control.Find("Source", control.Find("Package")) source = re_strip_source_version.sub('', source) if source_packages.has_key(source): @@ -392,12 +428,12 @@ def main (): # If we don't have a reason; spawn an editor so the user can add one # Write the rejection email out as the .reason file if not Options["Reason"] and not Options["No-Action"]: - temp_filename = daklib.utils.temp_filename() + (fd, temp_filename) = utils.temp_filename() editor = os.environ.get("EDITOR","vi") result = os.system("%s %s" % (editor, temp_filename)) if result != 0: - daklib.utils.fubar ("vi invocation failed for `%s'!" % (temp_filename), result) - temp_file = daklib.utils.open_file(temp_filename) + utils.fubar ("vi invocation failed for `%s'!" % (temp_filename), result) + temp_file = utils.open_file(temp_filename) for line in temp_file.readlines(): Options["Reason"] += line temp_file.close() @@ -420,7 +456,7 @@ def main (): maintainer_list = [] for maintainer_id in maintainers.keys(): - maintainer_list.append(daklib.database.get_maintainer(maintainer_id)) + maintainer_list.append(get_maintainer(maintainer_id).name) summary = "" removals = d.keys() removals.sort() @@ -428,7 +464,7 @@ def main (): versions = d[package].keys() versions.sort(apt_pkg.VersionCompare) for version in versions: - d[package][version].sort(daklib.utils.arch_compare_sw) + d[package][version].sort(utils.arch_compare_sw) summary += "%10s | %10s | %s\n" % (package, version, ", ".join(d[package][version])) print "Will remove the following packages from %s:" % (suites_list) print @@ -445,7 +481,8 @@ def main (): print if Options["Rdep-Check"]: - reverse_depends_check(removals, suites) + arches = utils.split_args(Options["Architecture"]) + reverse_depends_check(removals, suites, arches) # If -n/--no-action, drop out here if Options["No-Action"]: @@ -454,11 +491,11 @@ def main (): print "Going to remove the packages now." game_over() - whoami = daklib.utils.whoami() + whoami = utils.whoami() date = commands.getoutput('date -R') # Log first; if it all falls apart I want a record that we at least tried. - logfile = daklib.utils.open_file(Cnf["Rm::LogFile"], 'a') + logfile = utils.open_file(cnf["Rm::LogFile"], 'a') logfile.write("=========================================================================\n") logfile.write("[Date: %s] [ftpmaster: %s]\n" % (date, whoami)) logfile.write("Removed the following packages from %s:\n\n%s" % (suites_list, summary)) @@ -468,23 +505,25 @@ def main (): logfile.write("----------------------------------------------\n") logfile.flush() - dsc_type_id = daklib.database.get_override_type_id('dsc') - deb_type_id = daklib.database.get_override_type_id('deb') + dsc_type_id = get_override_type('dsc', session).overridetype_id + deb_type_id = get_override_type('deb', session).overridetype_id # Do the actual deletion print "Deleting...", sys.stdout.flush() - projectB.query("BEGIN WORK") + for i in to_remove: package = i[0] architecture = i[2] package_id = i[3] for suite_id in suite_ids_list: if architecture == "source": - projectB.query("DELETE FROM src_associations WHERE source = %s AND suite = %s" % (package_id, suite_id)) + session.execute("DELETE FROM src_associations WHERE source = :packageid AND suite = :suiteid", + {'packageid': package_id, 'suiteid': suite_id}) #print "DELETE FROM src_associations WHERE source = %s AND suite = %s" % (package_id, suite_id) else: - projectB.query("DELETE FROM bin_associations WHERE bin = %s AND suite = %s" % (package_id, suite_id)) + session.execute("DELETE FROM bin_associations WHERE bin = :packageid AND suite = :suiteid", + {'packageid': package_id, 'suiteid': suite_id}) #print "DELETE FROM bin_associations WHERE bin = %s AND suite = %s" % (package_id, suite_id) # Delete from the override file if not Options["Partial"]: @@ -492,40 +531,44 @@ def main (): type_id = dsc_type_id else: type_id = deb_type_id - projectB.query("DELETE FROM override WHERE package = '%s' AND type = %s AND suite = %s %s" % (package, type_id, suite_id, over_con_components)) - projectB.query("COMMIT WORK") + # TODO: Again, fix this properly to remove the remaining non-bind argument + session.execute("DELETE FROM override WHERE package = :package AND type = :typeid AND suite = :suiteid %s" % (over_con_components), {'package': package, 'typeid': type_id, 'suiteid': suite_id}) + session.commit() print "done." # Send the bug closing messages if Options["Done"]: Subst = {} - Subst["__RM_ADDRESS__"] = Cnf["Rm::MyEmailAddress"] - Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"] + Subst["__RM_ADDRESS__"] = cnf["Rm::MyEmailAddress"] + Subst["__BUG_SERVER__"] = cnf["Dinstall::BugServer"] bcc = [] - if Cnf.Find("Dinstall::Bcc") != "": - bcc.append(Cnf["Dinstall::Bcc"]) - if Cnf.Find("Rm::Bcc") != "": - bcc.append(Cnf["Rm::Bcc"]) + if cnf.Find("Dinstall::Bcc") != "": + bcc.append(cnf["Dinstall::Bcc"]) + if cnf.Find("Rm::Bcc") != "": + bcc.append(cnf["Rm::Bcc"]) if bcc: Subst["__BCC__"] = "Bcc: " + ", ".join(bcc) else: Subst["__BCC__"] = "X-Filler: 42" - Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie $Revision: 1.44 $" + Subst["__CC__"] = "X-DAK: dak rm" if carbon_copy: Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy) Subst["__SUITE_LIST__"] = suites_list - Subst["__SUMMARY__"] = summary - Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"] - Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"] + summarymail = "%s\n------------------- Reason -------------------\n%s\n" % (Options["Reason"]) + summarymail += "----------------------------------------------\n" + Subst["__SUMMARY__"] = summarymail + Subst["__SUBJECT__"] = "Removed package(s) from %s" % (suite_list) + Subst["__ADMIN_ADDRESS__"] = cnf["Dinstall::MyAdminAddress"] + Subst["__DISTRO__"] = cnf["Dinstall::MyDistribution"] Subst["__WHOAMI__"] = whoami - whereami = daklib.utils.where_am_i() - Archive = Cnf.SubTree("Archive::%s" % (whereami)) + whereami = utils.where_am_i() + Archive = cnf.SubTree("Archive::%s" % (whereami)) Subst["__MASTER_ARCHIVE__"] = Archive["OriginServer"] Subst["__PRIMARY_MIRROR__"] = Archive["PrimaryMirror"] - for bug in daklib.utils.split_args(Options["Done"]): + for bug in utils.split_args(Options["Done"]): Subst["__BUG_NUMBER__"] = bug - mail_message = daklib.utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/rm.bug-close") - daklib.utils.send_mail(mail_message) + mail_message = utils.TemplateSubst(Subst,cnf["Dir::Templates"]+"/rm.bug-close") + utils.send_mail(mail_message) logfile.write("=========================================================================\n") logfile.close()