@@ -1,6 +1,7 @@

+  * Report nonzero death of m4 better.

diff --git a/changelog b/changelog
index 1f5e2e23992d6cc99137f261963cb9999d56aa19..8783e65392d53f91285c469f27bba1a070023c25 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 userv-utils (0.2.4) unstable; urgency=low
 
   * Minor fixes to INSTALL.
+  * Report nonzero death of m4 better.
 
  --
 

diff --git a/debian/changelog b/debian/changelog
index 1f5e2e23992d6cc99137f261963cb9999d56aa19..8783e65392d53f91285c469f27bba1a070023c25 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 userv-utils (0.2.4) unstable; urgency=low
 
   * Minor fixes to INSTALL.
+  * Report nonzero death of m4 better.
 
  --
 

diff --git a/ipif/udptunnel-reconf.pl b/ipif/udptunnel-reconf.pl
index d802e6fe870a8167ec1488ca85c7dc823ce74d1f..e4851a47fdba0c102c3acb45feeda48ff0a6063a 100755 (executable)
--- a/ipif/udptunnel-reconf.pl
+++ b/ipif/udptunnel-reconf.pl
@@ -55,7 +55,7 @@ sub run_m4 ($$$) {
     undef $/;
     $m4out= <X>;
     $/= "\n";
-    close X; $? and exit -1;
+    $!=0; close X; $? and die "m4 failed with code $? $!";
     $m4out =~ s/^\s+//;
     $m4out =~ s/\n+/\n/g;
     $m4out =~ s/\s+$//;