From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 19 Mar 2010 11:54:53 +0000 (+0000)
Subject: Merge branch 'master' of /u/webstump/live-urcm
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?p=modbot-mtm.git;a=commitdiff_plain;h=4ef8ba038f2503bbb4eacfe18ceaca2690835ddd;hp=6ea48c961acca9513fea8bd6dd4b8bc400e04252

Merge branch 'master' of /u/webstump/live-urcm
---

diff --git a/stump/bin/acceptFromMod.pl b/stump/bin/acceptFromMod.pl
index 3e408f1..fde6b3d 100755
--- a/stump/bin/acceptFromMod.pl
+++ b/stump/bin/acceptFromMod.pl
@@ -130,6 +130,7 @@ while( <> ) {
 }
 
 print STDERR "Comment is: $comment\n" if( $comment );
+print STDERR "Signal handling for SIGPIPE: $SIG{PIPE}.\n";
 
 $ENV{'EXPLANATION'} = $comment;
 
@@ -144,7 +145,7 @@ open( COMMAND, "| $command" ) ||  &processError( "$command failed" );
 #       "\n======================================= MODERATOR'S COMMENT: \n" .
 #       $comment;
 #  }
-close( COMMAND ) or die "$? $!";
+close( COMMAND ) or die "$command $? $!";
 
 &processError( "No action specified" ) 
   if( $done ne "yes" );
diff --git a/stump/bin/processApproved b/stump/bin/processApproved
index 615d0c1..1b2f176 100755
--- a/stump/bin/processApproved
+++ b/stump/bin/processApproved
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 set -o pipefail
 
 NEWSBIN=/var/lib/newsbin; export NEWSBIN