From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Oct 2018 13:38:39 +0000 (+0100)
Subject: dgit: Improve some error messages about changes files
X-Git-Tag: archive/debian/7.0_pre1~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=872b83f4cd6b6293b6f5e4330b6be8b7578b5b89;p=dgit.git

dgit: Improve some error messages about changes files

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

diff --git a/dgit b/dgit
index f826cdaa..77c85e5d 100755
--- a/dgit
+++ b/dgit
@@ -6372,10 +6372,12 @@ END
 	runcmd_ordryrun_local @mergechanges, @changesfiles;
 	my $multichanges = changespat $version,'multi';
 	if (act_local()) {
-	    stat_exists $multichanges or fail "$multichanges: $!";
+	    stat_exists $multichanges
+		or fail "$multichanges unexpectedly not created by build";
 	    foreach my $cf (glob $pat) {
 		next if $cf eq $multichanges;
-		rename "$cf", "$cf.inmulti" or fail "$cf\{,.inmulti}: $!";
+		rename "$cf", "$cf.inmulti" or
+		    fail "install new changes $cf\{,.inmulti}: $!";
 	    }
 	}
 	$result = $multichanges;