X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=melanie;h=23b89e5413723dc32efc4a0a47bae63089b72c80;hb=3686a00f1001f2d5692fa5e706b898053e39191a;hp=dd52ae31126d5f49e8eb75fe1f7a8962c595423b;hpb=7c513da4020ea5a092713d811f0d97175461170f;p=dak.git diff --git a/melanie b/melanie index dd52ae31..23b89e54 100755 --- a/melanie +++ b/melanie @@ -1,8 +1,8 @@ #!/usr/bin/env python # General purpose package removal tool for ftpmaster -# Copyright (C) 2000, 2001, 2002 James Troup -# $Id: melanie,v 1.32 2002-10-21 14:11:51 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003, 2004 James Troup +# $Id: melanie,v 1.40 2004-04-01 17:13:11 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 @@ -40,8 +40,8 @@ ################################################################################ -import commands, os, pg, re, sys, tempfile -import utils, db_access +import commands, os, pg, re, sys; +import utils, db_access; import apt_pkg, apt_inst; ################################################################################ @@ -64,22 +64,24 @@ 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\"""" +ARCH, BUG#, COMPONENT and SUITE can be comma (or space) separated lists, e.g. + --architecture=m68k,i386""" sys.exit(exit_code) ################################################################################ -# "That's just fucking great! Game over, man! What the fuck are we -# going to do now?" +# "Hudson: What that's great, that's just fucking great man, now what +# the fuck are we supposed to do? We're in some real pretty shit now +# man...That's it man, game over man, game over, man! Game over! What +# the fuck are we gonna do now? What are we gonna do?" def game_over(): answer = utils.our_raw_input("Continue (y/N)? ").lower(); @@ -135,6 +137,12 @@ def main (): utils.warn("-a/--architecture implies -p/--partial."); Options["Partial"] = "true"; + # Force the admin to tell someone if we're not doing a rene-led removal + # (or closing a bug, which counts as telling someone). + if not Options["Carbon-Copy"] and not Options["Done"] \ + and Options["Reason"].find("[rene]") == -1: + utils.fubar("Need a -C/--carbon-copy if not closing a bug and not doing a rene-led removal."); + # Process -C/--carbon-copy # # Accept 3 types of arguments (space separated): @@ -143,7 +151,7 @@ def main (): # 3) contains a '@' - assumed to be an email address, used unmofidied # carbon_copy = []; - for copy_to in Options.get("Carbon-Copy").split(): + for copy_to in utils.split_args(Options.get("Carbon-Copy")): if utils.str_isnum(copy_to): carbon_copy.append(copy_to + "@" + Cnf["Dinstall::BugServer"]); elif copy_to == 'package': @@ -167,7 +175,7 @@ def main (): # Additional suite checks suite_ids_list = []; - suites = Options["Suite"].split(); + suites = utils.split_args(Options["Suite"]); suites_list = utils.join_with_commas_and(suites); if not Options["No-Action"]: for suite in suites: @@ -254,9 +262,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 = tempfile.mktemp(); - fd = os.open(temp_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700); - os.close(fd); + temp_filename = utils.temp_filename(); editor = os.environ.get("EDITOR","vi") result = os.system("%s %s" % (editor, temp_filename)) if result != 0: @@ -289,8 +295,9 @@ def main (): packages.sort(); for package in packages: versions = d[package].keys(); - versions.sort(); + versions.sort(apt_pkg.VersionCompare); for version in versions: + 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 @@ -299,7 +306,7 @@ def main (): if Options["Done"]: print "Will also close bugs: "+Options["Done"]; if carbon_copy: - print "Will also send CCs to:" + ", ".join(carbon_copy) + print "Will also send CCs to: " + ", ".join(carbon_copy) print print "------------------- Reason -------------------" print Options["Reason"]; @@ -368,7 +375,7 @@ def main (): Subst["__BCC__"] = "Bcc: " + ", ".join(bcc); else: Subst["__BCC__"] = "X-Filler: 42"; - Subst["__CC__"] = "X-Katie: melanie $Revision: 1.32 $"; + Subst["__CC__"] = "X-Katie: melanie $Revision: 1.40 $"; if carbon_copy: Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy); Subst["__SUITE_LIST__"] = suites_list; @@ -380,10 +387,10 @@ def main (): Archive = Cnf.SubTree("Archive::%s" % (whereami)); Subst["__MASTER_ARCHIVE__"] = Archive["OriginServer"]; Subst["__PRIMARY_MIRROR__"] = Archive["PrimaryMirror"]; - for bug in Options["Done"].split(): + for bug in utils.split_args(Options["Done"]): Subst["__BUG_NUMBER__"] = bug; mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/melanie.bug-close"); - utils.send_mail (mail_message, "") + utils.send_mail(mail_message); logfile.write("=========================================================================\n"); logfile.close();