summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-01 14:38:39 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-01 14:39:02 +0100
commit872b83f4cd6b6293b6f5e4330b6be8b7578b5b89 (patch)
tree6101ee7ce1058062c88562e4c4b02a88ad860962 /dgit
parente080e3f7d2ef1af449d88be632ebbb7ce097dfe5 (diff)
dgit: Improve some error messages about changes files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit6
1 files changed, 4 insertions, 2 deletions
diff --git a/dgit b/dgit
index f826cda..77c85e5 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;