From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Oct 2018 12:30:05 +0000 (+0100)
Subject: dgit: Improve some error messages
X-Git-Tag: archive/debian/7.0_pre1~25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0a87bee4083d73bf21ec70337f7fd098e523d6b5;p=dgit.git

dgit: Improve some error messages

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

diff --git a/dgit b/dgit
index 68e80df6..0046e9fe 100755
--- a/dgit
+++ b/dgit
@@ -5109,10 +5109,10 @@ sub i_file_buildinfo {
     if (!forceing [qw(buildinfo-changes-mismatch)]) {
 	files_compare_inputs($bd, $ch);
 	(getfield $bd, $_) eq (getfield $ch, $_) or
-	    fail "buildinfo mismatch $_"
+	    fail "buildinfo mismatch in field $_"
 	    foreach qw(Source Version);
 	!defined $bd->{$_} or
-	    fail "buildinfo contains $_"
+	    fail "buildinfo contains forbidden field $_"
 	    foreach qw(Changes Changed-by Distribution);
     }
     push @i_buildinfos, $bi;
@@ -5153,7 +5153,7 @@ sub i_want_signed_tag {
 
     return
 	push_mktags $i_clogp, $i_dscfn,
-	    $i_changesfn, 'remote changes',
+	    $i_changesfn, 'remote changes file',
 	    \@tagwants;
 }
 
@@ -5592,7 +5592,7 @@ sub quiltify ($$$$) {
 		die "contains leading punctuation\n" if m{^\W} || m{/\W};
 		die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
 		die "is series file\n" if m{$series_filename_re}o;
-		die "too long" if length > 200;
+		die "too long\n" if length > 200;
 	    };
 	    return $_ unless $@;
 	    print STDERR "quiltifying commit $cc:".