From: James Troup Date: Sat, 24 Mar 2001 03:30:16 +0000 (+0000) Subject: Fix installed mail subject for buildds X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0b8f604ea48e6ffeadc2687bf289901d5981aaba;p=dak.git Fix installed mail subject for buildds --- diff --git a/katie b/katie index 410871dd..5659d34a 100755 --- a/katie +++ b/katie @@ -2,7 +2,7 @@ # Installs Debian packaes # Copyright (C) 2000, 2001 James Troup -# $Id: katie,v 1.34 2001-03-21 05:37:23 troup Exp $ +# $Id: katie,v 1.35 2001-03-24 03:30:16 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 @@ -958,7 +958,7 @@ def stable_install (changes_filename, summary, short_summary): install_count = install_count + 1; if not Cnf["Dinstall::Options::No-Mail"]: - Subst["__SUITE__"] = "into stable"; + Subst["__SUITE__"] = " into stable"; Subst["__SUMMARY__"] = summary; utils.send_mail (mail_message, "") announce (short_summary, 1) @@ -1228,7 +1228,7 @@ def main(): Subst = {} Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]; Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"]; - bcc = "X-Katie: $Revision: 1.34 $" + bcc = "X-Katie: $Revision: 1.35 $" if Cnf.has_key("Dinstall::Bcc"): Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]); else: diff --git a/templates/katie.installed b/templates/katie.installed index 23b84375..1ed3af6d 100644 --- a/templates/katie.installed +++ b/templates/katie.installed @@ -1,7 +1,7 @@ From: __KATIE_ADDRESS__ To: __MAINTAINER_ADDRESS__ __BCC__ -Subject: __CHANGES_FILENAME__ INSTALLED __SUITE__ +Subject: __CHANGES_FILENAME__ INSTALLED__SUITE__ __REJECT_MESSAGE__ Installing: