From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Aug 2018 12:28:28 +0000 (+0100)
Subject: dgit: build-*: Cope with new-style --build= specifications
X-Git-Tag: archive/debian/6.10~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a14c832fb36fa6ccccc8d8a02507983bec9adb52;hp=48cd6449acfebc08b1ba2c00871737759c285216

dgit: build-*: Cope with new-style --build= specifications

Previously, we would generally bomb out.

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

diff --git a/dgit b/dgit
index d38d9149..695f2b7c 100755
--- a/dgit
+++ b/dgit
@@ -6226,16 +6226,27 @@ sub massage_dbp_args ($;$) {
     my $dmode = '-F';
     foreach my $l ($cmd, $xargs) {
 	next unless $l;
-	@$l = grep { !(m/^-[SgGFABb]$/s and $dmode=$_) } @$l;
+	@$l = grep { !(m/^-[SgGFABb]$|^--build=/s and $dmode=$_) } @$l;
     }
     push @$cmd, '-nc';
 #print STDERR "MASS1 ",Dumper($cmd, $xargs, $dmode);
     my $r = WANTSRC_BUILDER;
     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 ?";
+    if ($dmode =~ s/^--build=//) {
+	$r = 0;
+	my @d = split /,/, $dmode;
+	$r |= WANTSRC_SOURCE  if grep { s/^full$/binary/ } @d;
+	$r |= WANTSRC_SOURCE  if grep { s/^source$// } @d;
+	$r |= WANTSRC_BUILDER if grep { m/./ } @d;
+	fail "Wanted to build nothing!" unless $r;
+	$dmode = '--build='. join ',', grep m/./, @d;
+    } else {
+	$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);