dgit: build: Squash $buildproductsdir

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 2774f7e55819f0d05e4641a236471f61236dad55..d38d9149552aa06e45f66aa66cd9b818c162d347 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -322,6 +322,11 @@ sub branch_is_gdr ($) {
     # We have our own implementation because:
     #  - our algorighm can do fewer tests so is faster
     #  - it saves testing to see if gdr is installed
+
+    # NB we use this jsut for deciding whether to run gdr make-patches
+    # Before reusing this algorithm for somthing else, its
+    # suitability should be reconsidered.
+
     my $walk = $head;
     local $Debian::Dgit::debugcmd_when_debuglevel = 3;
     printdebug "branch_is_gdr $head...\n";
@@ -335,8 +340,8 @@ sub branch_is_gdr ($) {
        my $cdata = git_cat_file $walk, 'commit';
        my ($hdrs,$msg) = $cdata =~ m{\n\n} ? ($`,$') : ($cdata,'');
        if ($msg =~ m{^\[git-debrebase\ (
-                         anchor | pseudomerge | changelog | 
-                         make-patches | merged-breakwater
+                         anchor | changelog | make-patches | 
+                         merged-breakwater | pseudomerge
                      ) [: ] }mx) {
            # no need to analyse this - it's sufficient
            # (gdr classifications: Anchor, MergedBreakwaters)
@@ -6319,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);