summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-21 00:34:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-21 01:11:11 +0100
commita57e3b1aaf62ca5d28b4e65fdaf46340067b5748 (patch)
treec492d8cf688f2e7fdf92bf41ae2645dab98e3c56
parent1dd14bbf4f9cb4b6e973aa2813070c0847d71c31 (diff)
dgit, Dgit.pm: Clarify error framing a bit
Add a newline and "error:" before most error messages. Thius makes the output clearer, by distinguishing informational output (which might or might not relate to any error which is occurring) from things which are definitely wrong. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--Debian/Dgit.pm4
-rwxr-xr-xdgit2
2 files changed, 3 insertions, 3 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index c0ee27f..57b79e8 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -225,11 +225,11 @@ sub _us () {
}
sub failmsg {
- my $s = "@_\n";
+ my $s = "error: @_\n";
$s =~ s/\n\n$/\n/;
my $prefix = _us().": ";
$s =~ s/^/$prefix/gm;
- return $s;
+ return "\n".$s;
}
sub fail {
diff --git a/dgit b/dgit
index 05cf90d..961d974 100755
--- a/dgit
+++ b/dgit
@@ -5326,7 +5326,7 @@ sub quiltify ($$$$) {
return $s;
};
if ($quilt_mode eq 'linear') {
- print STDERR "$us: quilt fixup cannot be linear. Stopped at:\n";
+ print STDERR "\n$us: error: quilt fixup cannot be linear. Stopped at:\n";
foreach my $notp (@nots) {
print STDERR "$us: ", $reportnot->($notp), "\n";
}