summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-02 13:37:15 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-02 13:40:17 +0100
commitc05818233ddd170f946f9c6746eb4f0e1211d111 (patch)
tree2142971ab54f656c68e95d147c1c717ec27eec3f /git-debrebase
parent05b0c33bc4b28f2b0e105c9d72dd861a233d0d6e (diff)
git-debrebase: Improve two error messages
Print a proper message for failure to opendir the bpd and for failure to chdir to the toplevel. Doing this now makes the translation markup auditable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase
index 39f79cd..ba77924 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2516,7 +2516,7 @@ sub cmd_convert_from_gbp () {
my $clogp = parsechangelog();
my $version = $clogp->{'Version'}
- // die "missing Version from changelog";
+ // die "missing Version from changelog\n";
my ($upstream_spec) = @ARGV;
@@ -2748,7 +2748,7 @@ END
# we do a quick check to see if there are plausible origs
my $something=0;
if (!opendir BPD, $bpd) {
- die "$bpd: opendir: $!" unless $!==ENOENT;
+ die "opendir build-products-dir $bpd: $!" unless $!==ENOENT;
} else {
while ($!=0, my $f = readdir BPD) {
next unless is_orig_file_of_p_v $f, $p, $version;
@@ -2995,7 +2995,7 @@ initdebug('git-debrebase ');
enabledebug if $debuglevel;
my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
-chdir $toplevel or die "chdir $toplevel: $!";
+chdir $toplevel or fail "chdir toplevel $toplevel: $!\n";
$rd = fresh_playground "$playprefix/misc";