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: Move up $sourcechanges
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 274f73aa9cc00cb7594f43f4f5f988cda5bca40d..517f50a853ae83f45f96b4f7297678a553c48692 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,6
+4756,8
@@
sub cmd_push {
dopush();
}
dopush();
}
+our $sourcechanges;
+
sub cmd_push_source {
prep_push();
fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
sub cmd_push_source {
prep_push();
fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
@@
-5062,7
+5064,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 -----
@@
-6108,6
+6109,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++;
@@
-6183,10
+6188,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: