From cadb4c6130bb56b2be42c8efdbcbfbf9e2e1423f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 13 Oct 2018 11:08:27 +0100 Subject: 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 --- dgit | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dgit b/dgit index a443e5d..9c1f3e5 100755 --- a/dgit +++ b/dgit @@ -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) { -- cgit v1.2.3