From 0d2ecf8b5091eee4fde47f21a9a19ac9d4e38a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 28 Nov 2017 10:18:40 +0100 Subject: [PATCH] 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 ae727eb837..b65702474d 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -550,19 +550,24 @@ (define (report-parent-entries entry) (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: ~a@~a:~a ~a~%") + (report-error (G_ " first entry: ~a@~a~a ~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: ~a@~a:~a ~a~%") + (report-error (G_ " second entry: ~a@~a~a ~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)))