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

union: Slightly improve messages for file collisions. 

* guix/build/union.scm (union-build): Indent file names upon collision.
Remove "arbitrarily" from the message.
This commit is contained in:
Ludovic Courtès 2018-03-31 23:18:29 +02:00
parent fc95dc4c34
commit f8d1303864
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/build/union.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com> ;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com>
;;; ;;;
@ -93,14 +93,12 @@ make sure the caller can modify them later."
(cond ((null? dirs) (cond ((null? dirs)
;; The inputs are all files. ;; The inputs are all files.
(format (current-error-port) (format (current-error-port)
"~%warning: collision encountered:~%~{~a~%~}" "~%warning: collision encountered:~%~{ ~a~%~}"
files) files)
(let ((file (first files))) (let ((file (first files)))
;; TODO: Implement smarter strategies. ;; TODO: Implement smarter strategies.
(format (current-error-port) (format (current-error-port) "warning: choosing ~a~%" file)
"warning: arbitrarily choosing ~a~%"
file)
(symlink* file output))) (symlink* file output)))