Dgit.pm: fail: Strip any trailing newline

This makes it sensible to call fail() with a here doc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index bfa76cc70de127d66e1e235db79c0b83e2f2a16e..7c43059033886cb05ebe70308114610e1502eec8 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -159,6 +159,7 @@ sub _us () {
 
 sub fail { 
     my $s = "@_\n";
 
 sub fail { 
     my $s = "@_\n";

+    $s =~ s/\n\n$/\n/;

     my $prefix = _us().": ";
     $s =~ s/^/$prefix/gm;
     die $s;
     my $prefix = _us().": ";
     $s =~ s/^/$prefix/gm;
     die $s;