X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=blobdiff_plain;f=stump%2Fbin%2FprocessRejected;h=694d8e9195b1c5ca4314382e758ad6a70f786cdd;hb=8d19917103cd5b8185056a6ebfe951a45535c3ea;hp=046e6921cd517d27e078d747046184efcf5ff839;hpb=0f086a3142fbd6951cea31e37cb20ebf2c895ba6;p=modbot-mtm.git

diff --git a/stump/bin/processRejected b/stump/bin/processRejected
index 046e692..694d8e9 100755
--- a/stump/bin/processRejected
+++ b/stump/bin/processRejected
@@ -1,9 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 #
 # This script takes a raw article that is already rejected, creates a 
 # reply message, signs it with PGP and sends back to the author.
 #
 
+set -e
+
 # echo $0 invoked with arguments $@ 1>&2
 
 MESSAGE=$TMP/rejected.$$
@@ -23,9 +25,13 @@ reply() {
 
   if [ "x$REASON" = xdiscard ]; then return; fi
   (
+    eventheader="reject $REASON"
+    if [ "x$WEBSTUMP_MESSAGENUM" != x ]; then
+        eventheader="[$WEBSTUMP_MESSAGENUM] $eventheader"
+    fi
     cat $MESSAGE | formail -rt -I "Reply-To: $BOARD" 	\
 			       -I "Errors-To: $MUNGED_ADDRESS"	 \
-        -I "X-Webstump-Event: reject $REASON" \
+        -I "X-Webstump-Event: $eventheader" \
 	$MAILOUT_REJECT_FORMAIL_ARGS
     (
       echo "$EXPLANATION"