From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 Nov 2014 18:21:12 +0000 (+0000)
Subject: Make fail() cope with multi-line messages
X-Git-Tag: debian/0.30~288
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=3f747fd7e5b6d982d0b8a46532149e20d600a6c7;p=dgit.git

Make fail() cope with multi-line messages
---

diff --git a/dgit b/dgit
index 5c8d24a7..2056818b 100755
--- a/dgit
+++ b/dgit
@@ -163,7 +163,10 @@ sub waitstatusmsg () {
 sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
 
 sub fail { 
-    die $us.($we_are_responder ? " (build host)" : "").": @_\n";
+    my $s = "@_\n";
+    my $prefix = $us.($we_are_responder ? " (build host)" : "").": ";
+    $s =~ s/^/$prefix/gm;
+    die $s;
 }
 
 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }