Adapt for default filename in utils.send_mail().

diff --git a/amber b/amber
index db80a0d7a97c60fd92c2a812646d5f10a29baa4c..00bd0bafb5c98aa5b668c1a316238cf4bdd5c2f1 100755 (executable)
--- a/amber
+++ b/amber
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Wrapper for Debian Security team
-# Copyright (C) 2002  James Troup <james@nocrew.org>
-# $Id: amber,v 1.7 2002-11-22 14:55:51 troup Exp $
+# Copyright (C) 2002, 2003  James Troup <james@nocrew.org>
+# $Id: amber,v 1.8 2003-03-14 19:06: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
@@ -254,7 +254,7 @@ def make_advisory(advisory_nr, changes_files):
 
     adv = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/amber.advisory");
     if not Options["No-Action"]:
-        utils.send_mail (adv, "");
+        utils.send_mail (adv);
     else:
         print "[<Would send template advisory mail>]";
 

diff --git a/jennifer b/jennifer
index d40d77c8698a7a9c3a658d136ff542b677c06828..d11ff0d1e4923abc1c028c6000b5eae762d50eb1 100755 (executable)
--- a/jennifer
+++ b/jennifer
@@ -2,7 +2,7 @@
 
 # Checks Debian packages from Incoming
 # Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.32 2003-02-11 18:10:37 troup Exp $
+# $Id: jennifer,v 1.33 2003-03-14 19:06: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
@@ -45,7 +45,7 @@ re_valid_pkg_name = re.compile(r"^[\dA-Za-z][\dA-Za-z\+\-\.]+$");
 ################################################################################
 
 # Globals
-jennifer_version = "$Revision: 1.32 $";
+jennifer_version = "$Revision: 1.33 $";
 
 Cnf = None;
 Options = None;
@@ -912,7 +912,7 @@ def acknowledge_new (summary):
         print "Sending new ack.";
         Subst["__SUMMARY__"] = summary;
         new_ack_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.new");
-        utils.send_mail(new_ack_message,"");
+        utils.send_mail(new_ack_message);
 
     # Finally remove the originals.
     os.chdir (pkg.directory);

diff --git a/katie.py b/katie.py
index fd44215acc83b27da74c99019e0a2c52e21f086c..2a9a9ecdc4b7512882cfcfa7dba3af18bd6398c5 100644 (file)
--- a/katie.py
+++ b/katie.py
@@ -2,7 +2,7 @@
 
 # Utility functions for katie
 # Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.30 2003-02-21 19:19:07 troup Exp $
+# $Id: katie.py,v 1.31 2003-03-14 19:06: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
@@ -308,7 +308,7 @@ distribution.""";
                     else:
                         Subst["__STABLE_WARNING__"] = "";
                     mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.bug-close");
-                    utils.send_mail (mail_message, "");
+                    utils.send_mail (mail_message);
             if action:
                 self.Logger.log(["closing bugs"]+bugs);
         else:                     # NMU
@@ -320,7 +320,7 @@ distribution.""";
             if action and control_message != "":
                 Subst["__CONTROL_MESSAGE__"] = control_message;
                 mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.bug-nmu-fixed");
-                utils.send_mail (mail_message, "");
+                utils.send_mail (mail_message);
             if action:
                 self.Logger.log(["setting bugs to fixed"]+bugs);
         summary += "\n";
@@ -353,7 +353,7 @@ distribution.""";
                 if Cnf.get("Dinstall::TrackingServer") and changes["architecture"].has_key("source"):
                     Subst["__ANNOUNCE_LIST_ADDRESS__"] = Subst["__ANNOUNCE_LIST_ADDRESS__"] + "\nBcc: %s@%s" % (changes["source"], Cnf["Dinstall::TrackingServer"]);
                 mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.announce");
-                utils.send_mail (mail_message, "");
+                utils.send_mail (mail_message);
 
         if Cnf.FindB("Dinstall::CloseBugs"):
             summary = self.close_bugs(summary, action);
@@ -386,7 +386,7 @@ distribution.""";
             Subst["__SUITE__"] = "";
             Subst["__SUMMARY__"] = summary;
             mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.accepted");
-            utils.send_mail(mail_message, "")
+            utils.send_mail(mail_message)
             self.announce(short_summary, 1)
 
         # Special support to enable clean auto-building of accepted packages
@@ -471,7 +471,7 @@ distribution.""";
 
         Subst["__SUMMARY__"] = summary;
         mail_message = utils.TemplateSubst(Subst,self.Cnf["Dir::Templates"]+"/jennifer.override-disparity");
-        utils.send_mail (mail_message, "");
+        utils.send_mail(mail_message);
 
     ###########################################################################
 
@@ -587,7 +587,7 @@ distribution.""";
 
         # Send the rejection mail if appropriate
         if not Cnf["Dinstall::Options::No-Mail"]:
-            utils.send_mail (reject_mail_message, "");
+            utils.send_mail(reject_mail_message);
 
         self.Logger.log(["rejected", pkg.changes_file]);
         return 0;

diff --git a/kelly b/kelly
index 054988a2ffb94038d55942417a42abd21b0e4d4c..d1005702b3f71ea72816ad28f1ef4f701063540d 100755 (executable)
--- a/kelly
+++ b/kelly
@@ -2,7 +2,7 @@
 
 # Installs Debian packages
 # Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: kelly,v 1.7 2003-02-21 19:19:33 troup Exp $
+# $Id: kelly,v 1.8 2003-03-14 19:06: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
@@ -39,7 +39,7 @@ import db_access, katie, logging, utils;
 ###############################################################################
 
 # Globals
-kelly_version = "$Revision: 1.7 $";
+kelly_version = "$Revision: 1.8 $";
 
 Cnf = None;
 Options = None;
@@ -245,7 +245,7 @@ def do_reject ():
     os.write(fd, reject_mail_message);
     os.close(fd);
 
-    utils.send_mail (reject_mail_message, "");
+    utils.send_mail(reject_mail_message);
     Logger.log(["unaccepted", pkg.changes_file]);
 
 ###############################################################################
@@ -511,7 +511,7 @@ def stable_install (summary, short_summary):
         Subst["__SUITE__"] = " into stable";
         Subst["__SUMMARY__"] = summary;
         mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/kelly.installed");
-        utils.send_mail(mail_message, "");
+        utils.send_mail(mail_message);
         Katie.announce(short_summary, 1)
 
     # Finally remove the .katie file

diff --git a/lauren b/lauren
index e2dbcd71cd637181cd529fc5d7a466b6af71de71..82c9b990c73fe443182f6632d16891b499a78556 100755 (executable)
--- a/lauren
+++ b/lauren
@@ -2,7 +2,7 @@
 
 # Manually reject packages for proprosed-updates
 # Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: lauren,v 1.1 2003-02-21 19:18:05 troup Exp $
+# $Id: lauren,v 1.2 2003-03-14 19:06: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
@@ -27,7 +27,7 @@ import apt_pkg;
 ################################################################################
 
 # Globals
-lauren_version = "$Revision: 1.1 $";
+lauren_version = "$Revision: 1.2 $";
 
 Cnf = None;
 Options = None;
@@ -207,7 +207,7 @@ def reject (reject_message = ""):
 
     # Send the rejection mail if appropriate
     if not Options["No-Mail"]:
-        utils.send_mail (reject_mail_message, "");
+        utils.send_mail(reject_mail_message);
 
     # Finally remove the .katie file
     katie_file = os.path.join(Cnf["Suite::Proposed-Updates::CopyKatie"], os.path.basename(changes_file[:-8]+".katie"));

diff --git a/lisa b/lisa
index b092dbe80a96810cdf71f9f7bba5f5e1346a9a1a..b065e6821154ff96b9d663aa552136ba6d24afb9 100755 (executable)
--- a/lisa
+++ b/lisa
@@ -2,7 +2,7 @@
 
 # Handles NEW and BYHAND packages
 # Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: lisa,v 1.22 2003-03-05 15:57:41 troup Exp $
+# $Id: lisa,v 1.23 2003-03-14 19:06: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
@@ -42,7 +42,7 @@ import apt_pkg, apt_inst;
 import db_access, fernanda, katie, logging, utils;
 
 # Globals
-lisa_version = "$Revision: 1.22 $";
+lisa_version = "$Revision: 1.23 $";
 
 Cnf = None;
 Options = None;
@@ -613,7 +613,7 @@ def do_bxa_notification():
             summary += "Description: %s\n" % (control.Find("Description"));
     Katie.Subst["__BINARY_DESCRIPTIONS__"] = summary;
     bxa_mail = utils.TemplateSubst(Katie.Subst,Cnf["Dir::Templates"]+"/lisa.bxa_notification");
-    utils.send_mail(bxa_mail,"");
+    utils.send_mail(bxa_mail);
 
 ################################################################################