summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-25 16:58:37 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-25 16:58:37 +0100
commit47fcfa3ae0551a1ed90262dda3064e17aac28b12 (patch)
treebb804f214a14a6ca092c967b1a13e17a0b56c393 /dgit
parent87e81c248ac9d7966be07dc556035f3d395f5fcb (diff)
build modes handling: Check for stray .changes on all split brain build entries
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit7
1 files changed, 7 insertions, 0 deletions
diff --git a/dgit b/dgit
index 911ad4e..7508fe1 100755
--- a/dgit
+++ b/dgit
@@ -4950,6 +4950,11 @@ END
if @unwanted;
}
+sub midbuild_checkchanges_vanilla ($) {
+ my ($wantsrc) = @_;
+ midbuild_checkchanges() if $wantsrc == 1;
+}
+
sub postbuild_mergechanges_vanilla ($) {
my ($wantsrc) = @_;
if ($wantsrc == 1) {
@@ -4966,6 +4971,7 @@ sub cmd_build {
my $wantsrc = massage_dbp_args \@dbp;
if ($wantsrc > 0) {
build_source();
+ midbuild_checkchanges_vanilla $wantsrc;
} else {
build_prep();
}
@@ -5000,6 +5006,7 @@ sub cmd_gbp_build {
if ($wantsrc > 0) {
build_source();
+ midbuild_checkchanges_vanilla $wantsrc;
} else {
if (!$clean_using_builder) {
push @cmd, '--git-cleaner=true';