X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=f0a1e76cfad8f7fba10dfe48f9221c6c6730b7d8;hp=769e48ee6ee50c7c7924cd9f0bbec02cec3d5840;hb=9e33aefbc2d0b2cebdadba42bdf170ff608b5ac9;hpb=d7a62f56ca2269cd39b255f8397fd68adc4a16f0

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;