[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: ui: Avoid "pkg:out" syntax when reporting collisions.
From: |
Ludovic Courtès |
Subject: |
02/10: ui: Avoid "pkg:out" syntax when reporting collisions. |
Date: |
Tue, 28 Nov 2017 05:25:47 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 0d2ecf8b5091eee4fde47f21a9a19ac9d4e38a90
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 28 10:18:40 2017 +0100
ui: Avoid "pkg:out" syntax when reporting collisions.
* guix/ui.scm (call-with-error-handling)[manifest-entry-output*]: New
procedure. Use it when reporting collisions.
---
guix/ui.scm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index ae727eb..b657024 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -550,19 +550,24 @@ interpreted."
(manifest-entry-version parent))
(report-parent-entries parent))))
+ (define (manifest-entry-output* entry)
+ (match (manifest-entry-output entry)
+ ("out" "")
+ (output (string-append ":" output))))
+
(report-error (G_ "profile contains conflicting entries for
~a:~a~%")
(manifest-entry-name entry)
(manifest-entry-output entry))
- (report-error (G_ " first entry: address@hidden:~a ~a~%")
+ (report-error (G_ " first entry: address@hidden ~a~%")
(manifest-entry-name entry)
(manifest-entry-version entry)
- (manifest-entry-output entry)
+ (manifest-entry-output* entry)
(manifest-entry-item entry))
(report-parent-entries entry)
- (report-error (G_ " second entry: address@hidden:~a ~a~%")
+ (report-error (G_ " second entry: address@hidden ~a~%")
(manifest-entry-name conflict)
(manifest-entry-version conflict)
- (manifest-entry-output conflict)
+ (manifest-entry-output* conflict)
(manifest-entry-item conflict))
(report-parent-entries conflict)
(exit 1)))
- branch master updated (ff6dcc1 -> 65c0f43), Ludovic Courtès, 2017/11/28
- 02/10: ui: Avoid "pkg:out" syntax when reporting collisions.,
Ludovic Courtès <=
- 04/10: gnu: Add perl-file-desktopentry., Ludovic Courtès, 2017/11/28
- 06/10: gnu: xdg-utils: Add perl-file-mimeinfo as an input., Ludovic Courtès, 2017/11/28
- 01/10: gnu: node: Update to 8.9.1., Ludovic Courtès, 2017/11/28
- 10/10: services: xorg: Remove WindowMaker as a default fallback., Ludovic Courtès, 2017/11/28
- 07/10: services: xorg: Allow users to specify a list of modules., Ludovic Courtès, 2017/11/28
- 08/10: services: slim: Remove unused 'bash' configuration field., Ludovic Courtès, 2017/11/28
- 09/10: services: xorg: Document 'slim-configuration' and deprecate 'slim-service'., Ludovic Courtès, 2017/11/28
- 03/10: gnu: Add perl-file-basedir., Ludovic Courtès, 2017/11/28
- 05/10: gnu: Add perl-file-mimeinfo., Ludovic Courtès, 2017/11/28