X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=melanie;h=0919a88d2a5096df027a2f31768c773145d356f8;hb=fa7b68ee3d2c9d467669021fd62e09a407e1244a;hp=4042ef195485d9659b2e724e5940e5ffd858639f;hpb=258ca5e76f4c66976b363a00d7bef40d4bd6f277;p=dak.git diff --git a/melanie b/melanie index 4042ef19..0919a88d 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.30 2002-08-29 22:56:29 troup Exp $ +# $Id: melanie,v 1.33 2002-11-19 03:14:59 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,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; @@ -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': @@ -160,14 +160,14 @@ def main (): field = "b.package"; else: field = "s.source"; - con_packages = "AND %s IN (%s)" % (field, string.join(map(repr, arguments), ", ")); + 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 = string.split(Options["Suite"]); + suites = Options["Suite"].split(); suites_list = utils.join_with_commas_and(suites); if not Options["No-Action"]: for suite in suites: @@ -190,7 +190,7 @@ def main (): utils.warn("'source' in -a/--argument makes no sense and is ignored."); # Additional component processing - over_con_components = string.replace(con_components, "c.id", "component"); + over_con_components = con_components.replace("c.id", "component"); print "Working...", sys.stdout.flush(); @@ -223,14 +223,14 @@ def main (): 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 @@ -239,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); @@ -263,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 @@ -291,15 +291,15 @@ 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], ", ")); + 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"]; @@ -365,12 +365,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.30 $"; + Subst["__CC__"] = "X-Katie: melanie $Revision: 1.33 $"; 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"]; @@ -380,7 +380,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, "")