From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Aug 2018 11:20:44 +0000 (+0100)
Subject: dgit: build: Squash $buildproductsdir
X-Git-Tag: archive/debian/6.10~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b307adcedaf7ae391d106f397ff27c560fbc7d38;p=dgit.git

dgit: build: Squash $buildproductsdir

Things malfunction, because some things end up in .. and some in bpd.
Overriding this at least makes `dgit build' produce correct results,
albeit in the wrong place.

Closes: #906786.

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

diff --git a/dgit b/dgit
index 39621347..d38d9149 100755
--- a/dgit
+++ b/dgit
@@ -6324,9 +6324,10 @@ sub postbuild_mergechanges_vanilla ($) {
 sub cmd_build {
     build_prep_early();
     $buildproductsdir eq '..' or print STDERR <<END;
-$us: warning: build-products-dir set, but not supported by dgit build
-$us: warning: things may go wrong or files may go to the wrong place
+$us: warning: build-products-dir set, but not supported by dpkg-buildpackage
+$us: warning: build-products-dir will be ignored; files will go to ..
 END
+    $buildproductsdir = '..';
     my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
     my $wantsrc = massage_dbp_args \@dbp;
     build_prep($wantsrc);