From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Oct 2016 15:58:37 +0000 (+0100)
Subject: build modes handling: Check for stray .changes on all split brain build entries
X-Git-Tag: archive/debian/2.8~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=47fcfa3ae0551a1ed90262dda3064e17aac28b12;p=dgit.git

build modes handling: Check for stray .changes on all split brain build entries

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 911ad4ef..7508fe15 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';