[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: diagnostics: Avoid highlighting complete messages.
From: |
guix-commits |
Subject: |
06/09: diagnostics: Avoid highlighting complete messages. |
Date: |
Wed, 28 Aug 2019 12:53:12 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit d229215051b87bfc4657e8416f0e7b87c3ed620e
Author: Ludovic Courtès <address@hidden>
Date: Wed Aug 28 18:00:42 2019 +0200
diagnostics: Avoid highlighting complete messages.
* guix/diagnostics.scm (%highlight-argument): Don't highlight ARG if it
contains white space.
---
guix/diagnostics.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm
index 380cfbb..6c0753a 100644
--- a/guix/diagnostics.scm
+++ b/guix/diagnostics.scm
@@ -71,7 +71,12 @@ is a trivial format string."
(define* (%highlight-argument arg #:optional (port (guix-warning-port)))
"Highlight ARG, a format string argument, if PORT supports colors."
(cond ((string? arg)
- (highlight arg port))
+ ;; If ARG contains white space, don't highlight it, on the grounds
+ ;; that it may be a complete message in its own, like those produced
+ ;; by 'guix lint.
+ (if (string-any char-set:whitespace arg)
+ arg
+ (highlight arg port)))
((symbol? arg)
(highlight (symbol->string arg) port))
(else arg)))
- branch master updated (c6deb68 -> dae950c), guix-commits, 2019/08/28
- 02/09: swh: Correctly handle visits without a snapshot., guix-commits, 2019/08/28
- 08/09: remote, ssh: Show the command exit status upon failure., guix-commits, 2019/08/28
- 04/09: gnu: Add cedille., guix-commits, 2019/08/28
- 05/09: lint: Log diagnostics with 'info', not 'warning'., guix-commits, 2019/08/28
- 06/09: diagnostics: Avoid highlighting complete messages.,
guix-commits <=
- 03/09: gnu: agda-ial: Fix install step., guix-commits, 2019/08/28
- 01/09: swh: 'swh-download' prints debugging info., guix-commits, 2019/08/28
- 09/09: deploy: Do not quote error messages., guix-commits, 2019/08/28
- 07/09: gnu: emacs-evil-owl: Update to 0.0.1-2.e8fe5b2., guix-commits, 2019/08/28