From 47fcfa3ae0551a1ed90262dda3064e17aac28b12 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 25 Oct 2016 16:58:37 +0100 Subject: [PATCH] build modes handling: Check for stray .changes on all split brain build entries Signed-off-by: Ian Jackson --- dgit | 7 +++++++ 1 file changed, 7 insertions(+) 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'; -- 2.30.2