From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Oct 2016 15:58:12 +0000 (+0100)
Subject: build changes handling: Break out midbuild_checkchanges
X-Git-Tag: archive/debian/2.8~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=87e81c248ac9d7966be07dc556035f3d395f5fcb

build changes handling: Break out midbuild_checkchanges

No functional change.

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

diff --git a/dgit b/dgit
index d6a63268..911ad4ef 100755
--- a/dgit
+++ b/dgit
@@ -4938,6 +4938,18 @@ END
     printdone "build successful, results in $result\n" or die $!;
 }
 
+sub midbuild_checkchanges () {
+    my $pat = changespat $version;
+    return if $rmchanges;
+    my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
+    @unwanted = grep { $_ ne changespat $version,'source' } @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.
+END
+	if @unwanted;
+}
+
 sub postbuild_mergechanges_vanilla ($) {
     my ($wantsrc) = @_;
     if ($wantsrc == 1) {
@@ -5072,16 +5084,7 @@ sub cmd_build_source {
 
 sub cmd_sbuild {
     build_source();
-    my $pat = changespat $version;
-    if (!$rmchanges) {
-	my @unwanted = map { s#^\.\./##; $_; } glob "../$pat";
-	@unwanted = grep { $_ ne changespat $version,'source' } @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.
-END
-	    if @unwanted;
-    }
+    midbuild_checkchanges();
     in_parent {
 	if (act_local()) {
 	    stat_exists $dscfn or fail "$dscfn (in parent directory): $!";