X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=melanie;h=1a6fc08a00ce6fd896e8849d17ef922440a29d64;hb=2dc9f86581428e698e834087faa4795a39fcf154;hp=479b91e1c6bb3f445820337cb8e1631ad522c5fc;hpb=58afa1216ab7e85f70adbb62c0a485304b42ae82;p=dak.git diff --git a/melanie b/melanie index 479b91e1..1a6fc08a 100755 --- a/melanie +++ b/melanie @@ -1,8 +1,8 @@ #!/usr/bin/env python # General purpose package removal tool for ftpmaster -# Copyright (C) 2000, 2001 James Troup -# $Id: melanie,v 1.23 2002-02-22 02:19:26 troup Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $Id: melanie,v 1.27 2002-05-23 12:36:44 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 @@ -156,16 +156,11 @@ 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, ", ")); + con_packages = "AND %s IN (%s)" % (field, string.join(map(repr, arguments), ", ")); suites = []; suite_ids_list = []; for suite in string.split(Options["Suite"]): @@ -255,7 +250,7 @@ def main (): for i in source_packages.keys(): filename = string.join(source_packages[i], '/'); try: - dsc = utils.parse_changes(filename, 0); + dsc = utils.parse_changes(filename); except utils.cant_open_exc: utils.warn("couldn't open '%s'." % (filename)); continue; @@ -394,7 +389,7 @@ def main (): Subst["__BCC__"] = "Bcc: " + string.join(bcc, ", "); else: Subst["__BCC__"] = "X-Filler: 42"; - Subst["__CC__"] = "X-Melanie: $Revision: 1.23 $"; + Subst["__CC__"] = "X-Melanie: $Revision: 1.27 $"; if carbon_copy: Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", "); Subst["__SUITE_LIST__"] = suites_list; @@ -408,7 +403,7 @@ def main (): Subst["__PRIMARY_MIRROR__"] = Archive["PrimaryMirror"]; for bug in string.split(Options["Done"]): Subst["__BUG_NUMBER__"] = bug; - mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/melanie.bug-close","r").read()); + mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/melanie.bug-close"); utils.send_mail (mail_message, "") logfile.write("=========================================================================\n");