diff options
| -rwxr-xr-x | dgit | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -4762,6 +4762,8 @@ sub cmd_push_source { prep_push(); fail "dgit push-source: --include-dirty/--ignore-dirty does not make". "sense with push-source!" if $includedirty; + clean_tree(); + build_maybe_quilt_fixup(); if ($changesfile) { my $changes = parsecontrol("$buildproductsdir/$changesfile", "source changes file"); @@ -6321,11 +6323,10 @@ sub cmd_build { build_prep_early(); my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV); my $wantsrc = massage_dbp_args \@dbp; + build_prep(); if ($wantsrc & WANTSRC_SOURCE) { build_source(); midbuild_checkchanges_vanilla $wantsrc; - } else { - build_prep(); } if ($wantsrc & WANTSRC_BUILDER) { push @dbp, changesopts_version(); @@ -6394,6 +6395,7 @@ sub cmd_gbp_build { } } + build_prep(); if ($wantsrc & WANTSRC_SOURCE) { build_source(); midbuild_checkchanges_vanilla $wantsrc; @@ -6401,7 +6403,6 @@ sub cmd_gbp_build { if (!$clean_using_builder) { push @cmd, '--git-cleaner=true'; } - build_prep(); } maybe_unapply_patches_again(); if ($wantsrc & WANTSRC_BUILDER) { @@ -6413,7 +6414,6 @@ sub cmd_gbp_build { sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0 sub build_source { - build_prep(); $sourcechanges = changespat $version,'source'; if (act_local()) { unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT @@ -6450,14 +6450,15 @@ sub build_source { } sub cmd_build_source { - build_prep_early(); badusage "build-source takes no additional arguments" if @ARGV; + build_prep(); build_source(); maybe_unapply_patches_again(); printdone "source built, results in $dscfn and $sourcechanges"; } sub cmd_sbuild { + build_prep(); # not BUILDER because sbuild uses the .dsc build_source(); midbuild_checkchanges(); in_bpd { |