diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-13 11:08:27 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-13 11:33:17 +0100 |
commit | cadb4c6130bb56b2be42c8efdbcbfbf9e2e1423f (patch) | |
tree | a9ef15da4c8caa019b791582f1bcaeed069729d0 | |
parent | e89cc82116db7648b78941ca028c24d0b5675ae4 (diff) |
dgit: Abolish obsolete variable $clean_using_builder
Nothing ever sets this to a trueish value. Abolish it.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -6199,14 +6199,9 @@ sub maybe_unapply_patches_again () { #----- other building ----- -our $clean_using_builder; -# ^ tree is to be cleaned by dpkg-source's builtin idea that it should -# clean the tree before building (perhaps invoked indirectly by -# whatever we are using to run the build), rather than separately -# and explicitly by us. - sub clean_tree () { - return if $clean_using_builder; + # We always clean the tree ourselves, rather than leave it to the + # builder (dpkg-source, or soemthing which calls dpkg-source). if ($cleanmode eq 'dpkg-source') { maybe_apply_patches_dirtily(); runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean); @@ -6548,9 +6543,7 @@ sub cmd_gbp_build { build_source(); midbuild_checkchanges_vanilla $wantsrc; } else { - if (!$clean_using_builder) { - push @cmd, '--git-cleaner=true'; - } + push @cmd, '--git-cleaner=true'; } maybe_unapply_patches_again(); if ($wantsrc & WANTSRC_BUILDER) { |