From a57e3b1aaf62ca5d28b4e65fdaf46340067b5748 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 21 Jun 2018 00:34:47 +0100 Subject: [PATCH 1/1] 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 --- Debian/Dgit.pm | 4 ++-- dgit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index c0ee27fc..57b79e8a 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 05cf90d2..961d9748 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"; } -- 2.30.2