chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: build_source: Drop call to build_prep_early
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 0a770cd09b91c6e18cf68922d8dfaaa2878b4777..d948e622cb53d7ff8d381e03d43b239d4c08ee70 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-166,7
+166,7
@@
our $keyid;
autoflush STDOUT 1;
our $supplementary_message = '';
autoflush STDOUT 1;
our $supplementary_message = '';
-our $need_split_build_invocation =
0
;
+our $need_split_build_invocation =
1
;
our $split_brain = 0;
END {
our $split_brain = 0;
END {
@@
-4756,8
+4756,12
@@
sub cmd_push {
dopush();
}
dopush();
}
+our $sourcechanges;
+
sub cmd_push_source {
prep_push();
sub cmd_push_source {
prep_push();
+ fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
+ "sense with push-source!" if $includedirty;
if ($changesfile) {
my $changes = parsecontrol("$buildproductsdir/$changesfile",
"source changes file");
if ($changesfile) {
my $changes = parsecontrol("$buildproductsdir/$changesfile",
"source changes file");
@@
-4766,7
+4770,10
@@
sub cmd_push_source {
}
} else {
# Building a source package is very fast, so just do it
}
} else {
# Building a source package is very fast, so just do it
- build_source_for_push();
+ build_source();
+ die "er, patches are applied dirtily but shouldn't be.."
+ if $patches_applied_dirtily;
+ $changesfile = $sourcechanges;
}
dopush();
}
}
dopush();
}
@@
-5060,7
+5067,6
@@
sub i_want_signed_dsc_changes {
#---------- building etc. ----------
our $version;
#---------- building etc. ----------
our $version;
-our $sourcechanges;
our $dscfn;
#----- `3.0 (quilt)' handling -----
our $dscfn;
#----- `3.0 (quilt)' handling -----
@@
-6106,6
+6112,10
@@
sub cmd_clean () {
maybe_unapply_patches_again();
}
maybe_unapply_patches_again();
}
+# return values from massage_dbp_args are one or both of these flags
+sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
+sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
+
sub build_or_push_prep_early () {
our $build_or_push_prep_early_done //= 0;
return if $build_or_push_prep_early_done++;
sub build_or_push_prep_early () {
our $build_or_push_prep_early_done //= 0;
return if $build_or_push_prep_early_done++;
@@
-6181,10
+6191,6
@@
sub changesopts () {
return (changesopts_initial(), changesopts_version());
}
return (changesopts_initial(), changesopts_version());
}
-# return values from massage_dbp_args are one or both of these flags
-sub WANTSRC_SOURCE () { 01; } # caller should build source (separately)
-sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage
-
sub massage_dbp_args ($;$) {
my ($cmd,$xargs) = @_;
# We need to:
sub massage_dbp_args ($;$) {
my ($cmd,$xargs) = @_;
# We need to:
@@
-6247,7
+6253,7
@@
sub postbuild_mergechanges ($) {
# or if that is undef, be a no-op.
# Returns the changes file to report to the user.
my $pat = changespat $version;
# or if that is undef, be a no-op.
# Returns the changes file to report to the user.
my $pat = changespat $version;
- my @changesfiles = glob $pat;
+ my @changesfiles = g
rep { !m/_multi\.changes/ } g
lob $pat;
@changesfiles = sort {
($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
or $a cmp $b
@changesfiles = sort {
($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
or $a cmp $b
@@
-6284,7
+6290,10
@@
sub midbuild_checkchanges () {
my $pat = changespat $version;
return if $rmchanges;
my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
my $pat = changespat $version;
return if $rmchanges;
my @unwanted = map { s#.*/##; $_; } glob "$bpd_glob/$pat";
- @unwanted = grep { $_ ne changespat $version,'source' } @unwanted;
+ @unwanted = grep {
+ $_ ne changespat $version,'source' and
+ $_ ne changespat $version,'multi'
+ } @unwanted;
fail <<END
changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
Suggest you delete @unwanted.
fail <<END
changes files other than source matching $pat already present; building would result in ambiguity about the intended results.
Suggest you delete @unwanted.
@@
-6403,14
+6412,7
@@
sub cmd_gbp_build {
}
sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
}
sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
-sub build_source_for_push {
- build_source();
- maybe_unapply_patches_again();
- $changesfile = $sourcechanges;
-}
-
sub build_source {
sub build_source {
- build_prep_early();
build_prep();
$sourcechanges = changespat $version,'source';
if (act_local()) {
build_prep();
$sourcechanges = changespat $version,'source';
if (act_local()) {