nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-11-28 10:18:40 +01:00
parent 797d238789
commit 0d2ecf8b50
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/ui.scm
View File

@ -550,19 +550,24 @@ interpreted."
(manifest-entry-version parent)) (manifest-entry-version parent))
(report-parent-entries 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~%") (report-error (G_ "profile contains conflicting entries for ~a:~a~%")
(manifest-entry-name entry) (manifest-entry-name entry)
(manifest-entry-output 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-name entry)
(manifest-entry-version entry) (manifest-entry-version entry)
(manifest-entry-output entry) (manifest-entry-output* entry)
(manifest-entry-item entry)) (manifest-entry-item entry))
(report-parent-entries 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-name conflict)
(manifest-entry-version conflict) (manifest-entry-version conflict)
(manifest-entry-output conflict) (manifest-entry-output* conflict)
(manifest-entry-item conflict)) (manifest-entry-item conflict))
(report-parent-entries conflict) (report-parent-entries conflict)
(exit 1))) (exit 1)))