Also suppress spurious runs of the clean target when building using git-buildpackage.

diff --git a/debian/changelog b/debian/changelog
index 2f296309086665ec6593209448df87faa2930a8b..7e17a8fe4a1d4c6c3bac8df31043f5fe9a5b13a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ dgit (1.1~~) unstable; urgency=low
     than running it twice.  When we are _not_ supposed to be using
     dpkg-buildpackage to clean, but we are running it to do the build,
     pass -nc.
+  * Also suppress spurious runs of the clean target when building using
+    git-buildpackage.
 
  --
 

diff --git a/dgit b/dgit
index 22a1ccd0fbd682c2796aec05f801a12248e79997..ad460d14add2d9e696f9d10e416c784cbb4d8958 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2973,10 +2973,15 @@ sub cmd_build {
 sub cmd_gbp_build {
     my @dbp = @dpkgbuildpackage;
     massage_dbp_args \@dbp;
-    build_prep();
     my @cmd =
        (qw(git-buildpackage -us -uc --git-no-sign-tags),
         "--git-builder=@dbp");
+    if ($cleanmode eq 'dpkg-source') {
+       $suppress_clean = 1;
+    } else {
+       push @cmd, '--git-cleaner=true';
+    }
+    build_prep();
     unless (grep { m/^--git-debian-branch|^--git-ignore-branch/ } @ARGV) {
        canonicalise_suite();
        push @cmd, "--git-debian-branch=".lbranch();