From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Sep 2016 22:45:19 +0000 (+0100)
Subject: Dgit.pm: fail: Strip any trailing newline
X-Git-Tag: archive/debian/2.0~156
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=be01dc41afcebe1f3931c7137fdbacdb0966c2ae;hp=ada4118415b67675c6ba281c818d99dfd212d1b2;ds=sidebyside

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 bfa76cc7..7c430590 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -159,6 +159,7 @@ sub _us () {
 
 sub fail { 
     my $s = "@_\n";
+    $s =~ s/\n\n$/\n/;
     my $prefix = _us().": ";
     $s =~ s/^/$prefix/gm;
     die $s;