summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-26 10:36:01 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-26 11:17:21 +0100
commita267940ec7a8601c290198f13292abb7ca77c11e (patch)
treeb01e7bc3db9e60c791da923ab0eb3ba328a605c3 /dgit
parent6b764d3497dce00128d8fd56d4b2401d875606d1 (diff)
dgit: build_prep: Provide it with $wantsrc
No functional change yet as it doesn't use it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit11
1 files changed, 6 insertions, 5 deletions
diff --git a/dgit b/dgit
index db52f91..b1df95e 100755
--- a/dgit
+++ b/dgit
@@ -6134,7 +6134,8 @@ sub build_prep_early () {
check_not_dirty();
}
-sub build_prep () {
+sub build_prep ($) {
+ my ($wantsrc) = @_;
build_prep_early();
clean_tree();
build_maybe_quilt_fixup();
@@ -6323,7 +6324,7 @@ sub cmd_build {
build_prep_early();
my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV);
my $wantsrc = massage_dbp_args \@dbp;
- build_prep();
+ build_prep($wantsrc);
if ($wantsrc & WANTSRC_SOURCE) {
build_source();
midbuild_checkchanges_vanilla $wantsrc;
@@ -6395,7 +6396,7 @@ sub cmd_gbp_build {
}
}
- build_prep();
+ build_prep($wantsrc);
if ($wantsrc & WANTSRC_SOURCE) {
build_source();
midbuild_checkchanges_vanilla $wantsrc;
@@ -6451,14 +6452,14 @@ sub build_source {
sub cmd_build_source {
badusage "build-source takes no additional arguments" if @ARGV;
- build_prep();
+ build_prep(WANTSRC_SOURCE);
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_prep(WANTSRC_SOURCE); # not BUILDER because sbuild uses the .dsc
build_source();
midbuild_checkchanges();
in_bpd {