From d1429a5ed3d1914ccc502ae146b32445967e9ba8 Mon Sep 17 00:00:00 2001 From: James Troup Date: Fri, 14 Mar 2003 19:06:02 +0000 Subject: [PATCH] Adapt for default filename in utils.send_mail(). --- amber | 6 +++--- jennifer | 6 +++--- katie.py | 14 +++++++------- kelly | 8 ++++---- lauren | 6 +++--- lisa | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/amber b/amber index db80a0d7..00bd0baf 100755 --- a/amber +++ b/amber @@ -1,8 +1,8 @@ #!/usr/bin/env python # Wrapper for Debian Security team -# Copyright (C) 2002 James Troup -# $Id: amber,v 1.7 2002-11-22 14:55:51 troup Exp $ +# Copyright (C) 2002, 2003 James Troup +# $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 "[]"; diff --git a/jennifer b/jennifer index d40d77c8..d11ff0d1 100755 --- a/jennifer +++ b/jennifer @@ -2,7 +2,7 @@ # Checks Debian packages from Incoming # Copyright (C) 2000, 2001, 2002, 2003 James Troup -# $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 fd44215a..2a9a9ecd 100644 --- a/katie.py +++ b/katie.py @@ -2,7 +2,7 @@ # Utility functions for katie # Copyright (C) 2001, 2002, 2003 James Troup -# $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 054988a2..d1005702 100755 --- a/kelly +++ b/kelly @@ -2,7 +2,7 @@ # Installs Debian packages # Copyright (C) 2000, 2001, 2002, 2003 James Troup -# $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 e2dbcd71..82c9b990 100755 --- a/lauren +++ b/lauren @@ -2,7 +2,7 @@ # Manually reject packages for proprosed-updates # Copyright (C) 2001, 2002, 2003 James Troup -# $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 b092dbe8..b065e682 100755 --- a/lisa +++ b/lisa @@ -2,7 +2,7 @@ # Handles NEW and BYHAND packages # Copyright (C) 2001, 2002, 2003 James Troup -# $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); ################################################################################ -- 2.39.2