merge months of changes on ftp-master, see ChangeLog

[dak.git] / melanie

diff --git a/melanie b/melanie
index 0ca9abdab3c1ac21e5b45abf83b223414be981b7..3b2596ccc4170ec5ed67d9c252efcd7301a2a910 100755 (executable)
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose package removal tool for ftpmaster
 # Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.43 2004-11-27 18:12:57 troup Exp $
+# $Id: melanie,v 1.44 2005-11-15 09:50:32 ajt 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
@@ -162,7 +162,7 @@ def reverse_depends_check(removals, suites):
                 if unsat == len(dep):
                     component = p2c[package];
                     if component != "main":
-                        what = "%s/%s" (package, component);
+                        what = "%s/%s" % (package, component);
                     else:
                         what = "** %s" % (package);
                     print "%s has an unsatisfied dependency on %s: %s" % (what, architecture, utils.pp_deps(dep));
@@ -509,7 +509,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + ", ".join(bcc);
         else:
             Subst["__BCC__"] = "X-Filler: 42";
-        Subst["__CC__"] = "X-Katie: melanie $Revision: 1.43 $";
+        Subst["__CC__"] = "X-Katie: melanie $Revision: 1.44 $";
         if carbon_copy:
             Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy);
         Subst["__SUITE_LIST__"] = suites_list;