X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=9c76155435a679983361fd6bc3f8be3548e1591a;hb=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;hp=af6495272e170eeb637149462f10afc0373f4b41;hpb=7aaaad3135c9164390af5897925660842368660b;p=dak.git diff --git a/dak/rm.py b/dak/rm.py index af649527..9c761554 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -41,13 +41,10 @@ import commands, os, pg, re, sys import apt_pkg, apt_inst -import dak.lib.database as database -import dak.lib.utils as utils - -################################################################################ - -re_strip_source_version = re.compile (r'\s+.*$') -re_build_dep_arch = re.compile(r"\[[^]]+\]") +from daklib import database +from daklib import utils +from daklib.dak_exceptions import * +from daklib.regexes import re_strip_source_version, re_build_dep_arch ################################################################################ @@ -94,20 +91,25 @@ def game_over(): ################################################################################ -def reverse_depends_check(removals, suites): +def reverse_depends_check(removals, suites, arches=None): print "Checking reverse dependencies..." 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(Cnf.ValueList("Suite::%s::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) # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - temp_filename = utils.temp_filename() + (fd, temp_filename) = utils.temp_filename() (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename)) if (result != 0): utils.fubar("Gunzip invocation failed!\n%s\n" % (output), result) @@ -115,6 +117,12 @@ def reverse_depends_check(removals, suites): 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 @@ -158,21 +166,35 @@ def reverse_depends_check(removals, suites): unsat = 0 for dep_package, _, _ in dep: if dep_package in removals: - unsat += 1 + 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, 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) # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance... - temp_filename = 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)) @@ -196,17 +218,24 @@ def reverse_depends_check(removals, suites): unsat = 0 for dep_package, _, _ in dep: if dep_package in removals: - unsat += 1 + unsat += 1 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, 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"]: @@ -214,7 +243,7 @@ def reverse_depends_check(removals, suites): else: print "No dependency problem found." print - + ################################################################################ def main (): @@ -239,16 +268,16 @@ 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::%s" % (i)): + Cnf["Rm::Options::%s" % (i)] = "" if not Cnf.has_key("Rm::Options::Suite"): - Cnf["Rm::Options::Suite"] = "unstable" + Cnf["Rm::Options::Suite"] = "unstable" arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) Options = Cnf.SubTree("Rm::Options") if Options["Help"]: - usage() + usage() projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) database.init(Cnf, projectB) @@ -257,7 +286,7 @@ def main (): if not arguments: utils.fubar("need at least one package name as an argument.") if Options["Architecture"] and Options["Source-Only"]: - 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"]: 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"): @@ -282,7 +311,7 @@ def main (): # carbon_copy = [] for copy_to in utils.split_args(Options.get("Carbon-Copy")): - if utils.str_isnum(copy_to): + if copy_to.isdigit(): carbon_copy.append(copy_to + "@" + Cnf["Dinstall::BugServer"]) elif copy_to == 'package': for package in arguments: @@ -298,7 +327,7 @@ def main (): field = "b.package" else: field = "s.source" - con_packages = "AND %s IN (%s)" % (field, ", ".join(map(repr, arguments))) + con_packages = "AND %s IN (%s)" % (field, ", ".join([ repr(i) for i in arguments ])) (con_suites, con_architectures, con_components, check_source) = \ utils.parse_args(Options) @@ -364,7 +393,7 @@ def main (): filename = "/".join(source_packages[i]) try: dsc = utils.parse_changes(filename) - except utils.cant_open_exc: + except CantOpenError: utils.warn("couldn't open '%s'." % (filename)) continue for package in dsc.get("binary").split(','): @@ -392,7 +421,7 @@ 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 = 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: @@ -445,7 +474,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"]: @@ -510,7 +540,7 @@ def main (): Subst["__BCC__"] = "Bcc: " + ", ".join(bcc) else: Subst["__BCC__"] = "X-Filler: 42" - Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: this header is obsolete" + Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie" if carbon_copy: Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy) Subst["__SUITE_LIST__"] = suites_list @@ -534,4 +564,3 @@ def main (): if __name__ == '__main__': main() -