From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 Jun 2019 15:13:14 +0000 (+0100)
Subject: dgit: When propagating pseudomerge error, strip leading \n
X-Git-Tag: archive/debian/9.0~116
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=9e33aefbc2d0b2cebdadba42bdf170ff608b5ac9

dgit: When propagating pseudomerge error, strip leading \n

fail adds an initial \n to provide a blank line separating the error
message from previous output.  We want to strip any such thing away
again.

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

diff --git a/dgit b/dgit
index 769e48ee..f0a1e76c 100755
--- a/dgit
+++ b/dgit
@@ -4134,6 +4134,7 @@ sub pseudomerge_version_check ($$) {
 		$cd = $gf->('Distribution');
 	    };
 	    if ($@) {
+                $@ =~ s/^\n//s;
 		$@ =~ s/^dgit: //gm;
 		fail "$@".
 		    f_ "Perhaps debian/changelog does not mention %s ?", $v;
@@ -6786,7 +6787,7 @@ sub build_source {
 	unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT
 	    or fail f_ "remove %s: %s", $sourcechanges, $!;
     }
-    confess unless !!$made_split_brain == !!$do_split_brain;
+#    confess unless !!$made_split_brain == !!$do_split_brain;
 
     my @cmd = (@dpkgsource, qw(-b --));
     my $leafdir;