summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-11-28 10:18:40 +0100
committerLudovic Courtès <ludo@gnu.org>2017-11-28 10:18:40 +0100
commit0d2ecf8b5091eee4fde47f21a9a19ac9d4e38a90 (patch)
tree2d67a569a444c2dc1a2aa0175b7e99663174fbf6 /guix
parent797d238789f7635bdd55aae103db1a7c4ff33798 (diff)
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.
Diffstat (limited to 'guix')
-rw-r--r--guix/ui.scm13
1 files 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 @@ 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: ~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)))