Move the mail header that carries the list of branches that were

committed to into the config file.

2 files changed, 12 insertions, 5 deletions

diff --git a/CVSROOT/cfg.pm b/CVSROOT/cfg.pm
index 2197512..f9f1c3e 100755
--- a/CVSROOT/cfg.pm
+++ b/CVSROOT/cfg.pm
@@ -11,7 +11,8 @@
 package cfg;
 use strict;
 use vars qw($DEBUG $FILE_PREFIX $MAILADDRS $MAILBANNER $MAILCMD
-	    $MAIL_ON_DIR_CREATION $TMPDIR %TEMPLATE_HEADERS
+	    $MAIL_BRANCH_HDR $MAIL_ON_DIR_CREATION
+	    $TMPDIR %TEMPLATE_HEADERS
 	    $CHECK_HEADERS $LAST_FILE $PID $IDHEADER $UNEXPAND_RCSID);
 
 
@@ -103,6 +104,10 @@ $MAILBANNER = "";
 # 0 = off, 1 = on.
 $MAIL_ON_DIR_CREATION = 0;
 
+# Include the names of the branches committed to in the commit email,
+# using this header.  (leave off the trailing ':').  Use "" if you don't
+# want one.
+$MAIL_BRANCH_HDR  = "X-CVS-Branch";
 
 
 ##############################################################
@@ -125,6 +130,9 @@ if ($hostname =~ /^(freefall|internat)\.freebsd\.org$/i) {
 		$MAILBANNER = "FreeBSD International Crypto Repository";
 	}
 	$MAILADDRS = $meister if $DEBUG;
+
+
+	$MAIL_BRANCH_HDR  = "X-FreeBSD-CVS-Branch:";
 }
 
 
diff --git a/CVSROOT/log_accum.pl b/CVSROOT/log_accum.pl
index c41b663..4cad459 100755
--- a/CVSROOT/log_accum.pl
+++ b/CVSROOT/log_accum.pl
@@ -49,8 +49,6 @@ my $MAIL_FILE     = "$BASE_FN.mail";
 my $SUBJ_FILE     = "$BASE_FN.subj";
 my $TAGS_FILE     = "$BASE_FN.tags";
 
-my $X_BRANCH_HDR  = "X-FreeBSD-CVS-Branch:";
-
 my $CVSROOT       = $ENV{'CVSROOT'} || "/home/ncvs";
 
 ############################################################
@@ -477,9 +475,10 @@ sub mail_notification {
 
 	# If required add a header to the mail msg showing
 	# which branches were modified during the commit.
-	if ($X_BRANCH_HDR) {
+	if ($cfg::MAIL_BRANCH_HDR) {
 		my %tags = map { $_ => 1 } &read_logfile($TAGS_FILE);
-		print MAIL "$X_BRANCH_HDR ", join(",", sort keys %tags), "\n";
+		print MAIL $cfg::MAIL_BRANCH_HDR, ": ";
+		print MAIL join(",", sort keys %tags), "\n";
 	}
 
 	print MAIL "\n";