X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=melanie;h=a0b7485ca39a85d9957dd5701f4e2b064cae0dca;hb=ab41ecb56d308bb801add07b90a258c0b57718e1;hp=893b8ae75660eb07e854270986bc13a9cbe064f3;hpb=bce58243846a5683b77f586c7210723b47227a60;p=dak.git

diff --git a/melanie b/melanie
index 893b8ae7..a0b7485c 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 <james@nocrew.org>
-# $Id: melanie,v 1.22 2002-02-12 22:14:38 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: melanie,v 1.24 2002-05-08 11:13:02 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
@@ -82,8 +82,7 @@ ARCH, BUG#, COMPONENT and SUITE can be space seperated lists, e.g.
 #  going to do now?"
 
 def game_over():
-    print "Continue (y/N)? ",
-    answer = string.lower(utils.our_raw_input());
+    answer = string.lower(utils.our_raw_input("Continue (y/N)? "));
     if answer != "y":
         print "Aborted."
         sys.exit(1);
@@ -395,7 +394,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + string.join(bcc, ", ");
         else:
             Subst["__BCC__"] = "X-Filler: 42";
-        Subst["__CC__"] = "X-Melanie: $Revision: 1.22 $";
+        Subst["__CC__"] = "X-Melanie: $Revision: 1.24 $";
         if carbon_copy:
             Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", ");
         Subst["__SUITE_LIST__"] = suites_list;
@@ -409,7 +408,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::TemplatesDir"]+"/melanie.bug-close");
             utils.send_mail (mail_message, "")
 
     logfile.write("=========================================================================\n");