X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=melanie;h=5f9cd82955d7fbc07cbc61897de33215b44c3009;hb=2e3d931ac7dbf2b90b4571cbd594aeed07f0bd8a;hp=5e012e5d6ef9e7898ba561eddea703af507ab75f;hpb=4edf024f09a7e8d813804dbba797efb95c3abfe6;p=dak.git diff --git a/melanie b/melanie index 5e012e5d..5f9cd829 100755 --- a/melanie +++ b/melanie @@ -2,7 +2,7 @@ # General purpose package removal tool for ftpmaster # Copyright (C) 2000, 2001, 2002 James Troup -# $Id: melanie,v 1.26 2002-05-18 23:54:51 troup Exp $ +# $Id: melanie,v 1.34 2003-01-02 18:14:52 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 @@ -29,8 +29,8 @@ # o OpenBSD team decide to switch to different packet filter under BSD # license. Because Project Goal: Every user should be able to make # changes to source tree. IPF license bad!! -# o Darren try get back: says, NetBSD, FreeBSD allowed! MUAHAHAHAH!!! -# o Theo say: no care, pf much better than ipf! +# o Darren try get back: says, NetBSD, FreeBSD allowed! MUAHAHAHAH!!! +# o Theo say: no care, pf much better than ipf! # o Darren changes mind: changes license. But OpenBSD will not change # back to ipf. Darren even much more bitter. # o Darren so bitterbitter. Decides: I'LL GET BACK BY FORKING OPENBSD AND @@ -40,7 +40,7 @@ ################################################################################ -import commands, os, pg, re, string, sys, tempfile +import commands, os, pg, re, sys, tempfile import utils, db_access import apt_pkg, apt_inst; @@ -64,12 +64,12 @@ Remove PACKAGE(s) from suite(s). -c, --component=COMPONENT act on this component -C, --carbon-copy=EMAIL send a CC of removal message to EMAIL -d, --done=BUG# send removal message as closure to bug# + -h, --help show this help and exit -m, --reason=MSG reason for removal -n, --no-action don't do anything -p, --partial don't affect override files -s, --suite=SUITE act on this suite -S, --source-only remove source only - -h, --help show this help and exit ARCH, BUG#, COMPONENT and SUITE can be space seperated lists, e.g. --architecture=\"m68k i386\"""" @@ -82,7 +82,7 @@ ARCH, BUG#, COMPONENT and SUITE can be space seperated lists, e.g. # going to do now?" def game_over(): - answer = string.lower(utils.our_raw_input("Continue (y/N)? ")); + answer = utils.our_raw_input("Continue (y/N)? ").lower(); if answer != "y": print "Aborted." sys.exit(1); @@ -143,7 +143,7 @@ def main (): # 3) contains a '@' - assumed to be an email address, used unmofidied # carbon_copy = []; - for copy_to in string.split(Options.get("Carbon-Copy")): + for copy_to in Options.get("Carbon-Copy").split(): if utils.str_isnum(copy_to): carbon_copy.append(copy_to + "@" + Cnf["Dinstall::BugServer"]); elif copy_to == 'package': @@ -156,71 +156,41 @@ def main (): else: utils.fubar("Invalid -C/--carbon-copy argument '%s'; not a bug number, 'package' or email address." % (copy_to)); - packages = {}; if Options["Binary-Only"]: field = "b.package"; else: field = "s.source"; - quoted_packages_list = [] - for package in arguments: - quoted_packages_list.append("'%s'" % package) - packages[package] = ""; - con_packages = "AND %s IN (%s)" % (field, string.join(quoted_packages_list, ", ")); - suites = []; - suite_ids_list = []; - for suite in string.split(Options["Suite"]): - - if not Options["No-Action"] and 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" - print "any other time." - game_over(); - elif not Options["No-Action"] and suite == "testing": - print "**WARNING About to remove from the testing suite!" - print "There's no need to do this normally as removals from unstable will" - print "propogate to testing automagically." - game_over(); - - suite_id = db_access.get_suite_id(suite); - if suite_id == -1: - utils.warn("suite '%s' not recognised." % (suite)); - else: - suites.append(suite); - suite_ids_list.append(suite_id); - if suite_ids_list: - suites_list = string.join(suites, ", ") - con_suites = "AND su.id IN (%s)" % string.join(map(str, suite_ids_list), ", "); - else: - utils.fubar("No correct suite given."); - if Options["Component"]: - components_ids_list = []; - for component in string.split(Options["Component"]): - component_id = db_access.get_component_id(component); - if component_id == -1: - utils.warn("component '%s' not recognised." % (component)); - else: - components_ids_list.append(component_id); - con_components = "AND c.id IN (%s)" % string.join(map(str, components_ids_list), ", "); - over_con_components = "AND component IN (%s)" % string.join(map(str, components_ids_list), ", "); - else: - con_components = ""; - over_con_components = ""; - - if Options["Architecture"]: - arch_ids_list = []; - for architecture in string.split(Options["Architecture"]): - architecture_id = db_access.get_architecture_id(architecture); - if architecture_id == -1: - utils.warn("architecture '%s' not recognised." % (architecture)); - else: - arch_ids_list.append(architecture_id); - if arch_ids_list: - con_architectures = "AND a.id IN (%s)" % string.join(map(str, arch_ids_list), ", "); - else: - utils.fubar("No correct architecture given"); - else: - con_architectures = ""; + con_packages = "AND %s IN (%s)" % (field, ", ".join(map(repr, arguments))); + (con_suites, con_architectures, con_components, check_source) = \ + utils.parse_args(Options); + + # Additional suite checks + suite_ids_list = []; + suites = Options["Suite"].split(); + suites_list = utils.join_with_commas_and(suites); + if not Options["No-Action"]: + for suite in suites: + suite_id = db_access.get_suite_id(suite); + if suite_id != -1: + suite_ids_list.append(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" + print "any other time." + game_over(); + elif suite == "testing": + print "**WARNING About to remove from the testing suite!" + print "There's no need to do this normally as removals from unstable will" + print "propogate to testing automagically." + game_over(); + + # Additional architecture checks + if Options["Architecture"] and check_source: + utils.warn("'source' in -a/--argument makes no sense and is ignored."); + + # Additional component processing + over_con_components = con_components.replace("c.id", "component"); print "Working...", sys.stdout.flush(); @@ -248,19 +218,19 @@ def main (): # Source + Binary binary_packages = {}; # First get a list of binary package names we suspect are linked to the source - q = projectB.query("SELECT DISTINCT package FROM binaries WHERE EXISTS (SELECT s.source, s.version, l.path, f.filename FROM source s, src_associations sa, suite su, files f, location l, component c WHERE binaries.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)); + 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(): 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 = string.join(source_packages[i], '/'); + filename = "/".join(source_packages[i]); try: dsc = utils.parse_changes(filename); except utils.cant_open_exc: utils.warn("couldn't open '%s'." % (filename)); continue; - for package in string.split(dsc.get("binary"), ','): - package = string.strip(package); + for package in dsc.get("binary").split(','): + package = package.strip(); binary_packages[package] = ""; # Then for each binary package: find any version in # unstable, check the Source: field in the deb matches our @@ -269,7 +239,7 @@ def main (): 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(): - filename = string.join(i[:2], '/'); + filename = "/".join(i[:2]); 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); @@ -277,6 +247,10 @@ def main (): to_remove.append(i[2:]); print "done." + if not to_remove: + print "Nothing to do." + sys.exit(0); + # 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"]: @@ -289,7 +263,7 @@ def main (): utils.fubar ("vi invocation failed for `%s'!" % (temp_filename), result) file = utils.open_file(temp_filename); for line in file.readlines(): - Options["Reason"] = Options["Reason"] + line; + Options["Reason"] += line; os.unlink(temp_filename); # Generate the summary of what's to be removed @@ -317,15 +291,16 @@ def main (): versions = d[package].keys(); versions.sort(); for version in versions: - summary = summary + "%10s | %10s | %s\n" % (package, version, string.join(d[package][version], ", ")); + 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 print summary - print "Maintainer: %s" % string.join(maintainer_list, ", ") + print "Maintainer: %s" % ", ".join(maintainer_list) if Options["Done"]: print "Will also close bugs: "+Options["Done"]; if carbon_copy: - print "Will also send CCs to:" + string.join(carbon_copy, ", ") + print "Will also send CCs to: " + ", ".join(carbon_copy) print print "------------------- Reason -------------------" print Options["Reason"]; @@ -391,12 +366,12 @@ def main (): if Cnf.Find("Melanie::Bcc") != "": bcc.append(Cnf["Melanie::Bcc"]); if bcc: - Subst["__BCC__"] = "Bcc: " + string.join(bcc, ", "); + Subst["__BCC__"] = "Bcc: " + ", ".join(bcc); else: Subst["__BCC__"] = "X-Filler: 42"; - Subst["__CC__"] = "X-Melanie: $Revision: 1.26 $"; + Subst["__CC__"] = "X-Katie: melanie $Revision: 1.34 $"; if carbon_copy: - Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", "); + Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy); Subst["__SUITE_LIST__"] = suites_list; Subst["__SUMMARY__"] = summary; Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]; @@ -406,7 +381,7 @@ def main (): Archive = Cnf.SubTree("Archive::%s" % (whereami)); Subst["__MASTER_ARCHIVE__"] = Archive["OriginServer"]; Subst["__PRIMARY_MIRROR__"] = Archive["PrimaryMirror"]; - for bug in string.split(Options["Done"]): + for bug in Options["Done"].split(): Subst["__BUG_NUMBER__"] = bug; mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/melanie.bug-close"); utils.send_mail (mail_message, "")