From owner-svn-src-head@FreeBSD.ORG  Wed Oct  8 04:20:29 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AD781065689;
	Wed,  8 Oct 2008 04:20:29 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5960C8FC0A;
	Wed,  8 Oct 2008 04:20:29 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m984KTNV020306;
	Wed, 8 Oct 2008 04:20:29 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m984KTkN020305;
	Wed, 8 Oct 2008 04:20:29 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <200810080420.m984KTkN020305@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 8 Oct 2008 04:20:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: svnadmin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183684 - svnadmin/hooks/scripts
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Oct 2008 04:20:29 -0000

Author: peter
Date: Wed Oct  8 04:20:28 2008
New Revision: 183684
URL: http://svn.freebsd.org/changeset/base/183684

Log:
  Emit a mail header to indicate which mailer.conf group triggered the
  message.

Modified:
  svnadmin/hooks/scripts/mailer.py

Modified: svnadmin/hooks/scripts/mailer.py
==============================================================================
--- svnadmin/hooks/scripts/mailer.py	Wed Oct  8 04:12:38 2008	(r183683)
+++ svnadmin/hooks/scripts/mailer.py	Wed Oct  8 04:20:28 2008	(r183684)
@@ -243,10 +243,11 @@ class MailedOutput(OutputBase):
 #    hdrs = 'From: %s\n'    \
 #    hdrs = 'To: %s\n'      \
     hdrs = 'Subject: %s\n' \
+           'X-SVN-Group: %s\n' \
            'MIME-Version: 1.0\n' \
            'Content-Type: text/plain; charset=UTF-8\n' \
            'Content-Transfer-Encoding: 8bit\n' \
-           % (subject)
+           % (subject, group or "defaults")
 #           % (self.from_addr, string.join(self.to_addrs, ', '), subject)
     if self.reply_to:
       hdrs = '%sReply-To: %s\n' % (hdrs, self.reply_to)