dgit: remove dead $need_split_build_invocation code path

No functional change.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

1 files changed, 9 insertions, 33 deletions

diff --git a/dgit b/dgit
index 031380c..c1723aa 100755
--- a/dgit
+++ b/dgit
@@ -166,7 +166,6 @@ our $keyid;
 autoflush STDOUT 1;
 
 our $supplementary_message = '';
-our $need_split_build_invocation = 1;
 our $split_brain = 0;
 
 END {
@@ -5619,8 +5618,6 @@ END
 	quilt_fixup_multipatch($clogp, $headref, $upstreamversion);
     }
 
-    die 'bug' if $split_brain && !$need_split_build_invocation;
-
     changedir $maindir;
     runcmd_ordryrun_local
         @git, qw(pull --ff-only -q), "$playground/work", qw(master);
@@ -6178,23 +6175,11 @@ sub changesopts () {
 
 sub massage_dbp_args ($;$) {
     my ($cmd,$xargs) = @_;
-    # We need to:
-    #
-    #  - if we're going to split the source build out so we can
-    #    do strange things to it, massage the arguments to dpkg-buildpackage
-    #    so that the main build doessn't build source (or add an argument
-    #    to stop it building source by default).
-    #
-    #  - add -nc to stop dpkg-source cleaning the source tree,
-    #    unless we're not doing a split build and want dpkg-source
-    #    as cleanmode, in which case we can do nothing
-    #
+    # Since we split the source build out so we can do strange things
+    # to it, massage the arguments to dpkg-buildpackage so that the
+    # main build doessn't build source (or add an argument to stop it
+    # building source by default).
     debugcmd '#massaging#', @$cmd if $debuglevel>1;
-#print STDERR "MASS0 ",Dumper($cmd, $xargs, $need_split_build_invocation);
-    if ($cleanmode eq 'dpkg-source' && !$need_split_build_invocation) {
-	$clean_using_builder = 1;
-	return WANTSRC_BUILDER;
-    }
     # -nc has the side effect of specifying -b if nothing else specified
     # and some combinations of -S, -b, et al, are errors, rather than
     # later simply overriding earlie.  So we need to:
@@ -6210,13 +6195,11 @@ sub massage_dbp_args ($;$) {
     push @$cmd, '-nc';
 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
     my $r = WANTSRC_BUILDER;
-    if ($need_split_build_invocation) {
-	printdebug "massage split $dmode.\n";
-	$r = $dmode =~ m/[S]/     ?  WANTSRC_SOURCE :
-	     $dmode =~ y/gGF/ABb/ ?  WANTSRC_SOURCE | WANTSRC_BUILDER :
-	     $dmode =~ m/[ABb]/   ?                   WANTSRC_BUILDER :
-	     die "$dmode ?";
-    }
+    printdebug "massage split $dmode.\n";
+    $r = $dmode =~ m/[S]/  ?  WANTSRC_SOURCE :
+      $dmode =~ y/gGF/ABb/ ?  WANTSRC_SOURCE | WANTSRC_BUILDER :
+      $dmode =~ m/[ABb]/   ?                   WANTSRC_BUILDER :
+      die "$dmode ?";
     printdebug "massage done $r $dmode.\n";
     push @$cmd, $dmode;
 #print STDERR "MASS2 ",Dumper($cmd, $xargs, $r);
@@ -6340,7 +6323,6 @@ sub cmd_gbp_build {
     if ($gbp_make_orig) {
 	clean_tree();
 	$cleanmode = 'none'; # don't do it again
-	$need_split_build_invocation = 1;
     }
 
     my @dbp = @dpkgbuildpackage;
@@ -6951,10 +6933,6 @@ sub parseopts () {
 		push @ropts, $_;
 		$tagformat_want = [ $1, 'command line', 1 ];
 		# 1 menas overrides distro configuration
-	    } elsif (m/^--always-split-source-build$/s) {
-		# undocumented, was once for testing, now a no-op
-		push @ropts, $_;
-		$need_split_build_invocation = 1;
 	    } elsif (m/^--config-lookup-explode=(.+)$/s) {
 		# undocumented, for testing
 		push @ropts, $_;
@@ -7108,8 +7086,6 @@ sub parseopts_late_defaults () {
 	$$vr = $v;
     }
 
-    $need_split_build_invocation ||= quiltmode_splitbrain();
-
     fail "dgit: --include-dirty is not supported in split view quilt mode"
 	if $split_brain && $includedirty;