X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=melanie;h=5e012e5d6ef9e7898ba561eddea703af507ab75f;hb=44f6878bd9cedddc46ddfabfc1e8660de1f32445;hp=a0b7485ca39a85d9957dd5701f4e2b064cae0dca;hpb=8ecf66b7d933929ca5f504a32fb54542b0b87b71;p=dak.git

diff --git a/melanie b/melanie
index a0b7485c..5e012e5d 100755
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose package removal tool for ftpmaster
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.24 2002-05-08 11:13:02 troup Exp $
+# $Id: melanie,v 1.26 2002-05-18 23:54:51 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
@@ -255,7 +255,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 +394,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + string.join(bcc, ", ");
         else:
             Subst["__BCC__"] = "X-Filler: 42";
-        Subst["__CC__"] = "X-Melanie: $Revision: 1.24 $";
+        Subst["__CC__"] = "X-Melanie: $Revision: 1.26 $";
         if carbon_copy:
             Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", ");
         Subst["__SUITE_LIST__"] = suites_list;
@@ -408,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,Cnf["Dir::TemplatesDir"]+"/melanie.bug-close");
+            mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/melanie.bug-close");
             utils.send_mail (mail_message, "")
 
     logfile.write("=========================================================================\n");