X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=37cdad28bbcd2e46bb019e3f60ce2a91b1fc439c;hb=6964d599dc653833150d0f22cf71365fdbae4e12;hp=8008232be9cca815c4821d71d40d986e31f65eae;hpb=f40df055fa0d4b37b6aac772e40747b8285c8c7c;p=dak.git diff --git a/dak/rm.py b/dak/rm.py index 8008232b..37cdad28 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -282,7 +282,7 @@ def main (): # carbon_copy = [] for copy_to in daklib.utils.split_args(Options.get("Carbon-Copy")): - if daklib.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 +298,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) = \ daklib.utils.parse_args(Options) @@ -510,7 +510,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 $Revision: 1.44 $" if carbon_copy: Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy) Subst["__SUITE_LIST__"] = suites_list