From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 2 Oct 2018 12:37:15 +0000 (+0100)
Subject: git-debrebase: Improve two error messages
X-Git-Tag: archive/debian/7.0~38
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c05818233ddd170f946f9c6746eb4f0e1211d111;p=dgit.git

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>
---

diff --git a/git-debrebase b/git-debrebase
index 39f79cd5..ba77924b 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";