aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-03-31 23:18:29 +0200
committerLudovic Courtès <ludo@gnu.org>2018-03-31 23:30:50 +0200
commitf8d13038645e635634469b673bcc20d87c91b913 (patch)
tree0b66c876e67ed659b4193047cf2b7a6149f8edca
parentfc95dc4c34bf88ebd8c21752bf6d54b5cf752d1a (diff)
downloadguix-f8d13038645e635634469b673bcc20d87c91b913.tar.gz
guix-f8d13038645e635634469b673bcc20d87c91b913.zip
union: Slightly improve messages for file collisions.
* guix/build/union.scm (union-build): Indent file names upon collision. Remove "arbitrarily" from the message.
-rw-r--r--guix/build/union.scm8
1 files changed, 3 insertions, 5 deletions
diff --git a/guix/build/union.scm b/guix/build/union.scm
index d46b750035..5f1cf8e450 100644
--- a/guix/build/union.scm
+++ b/guix/build/union.scm
@@ -1,5 +1,5 @@
;;; 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 © 2017 Huang Ying <huang.ying.caritas@gmail.com>
;;;
@@ -93,14 +93,12 @@ make sure the caller can modify them later."
(cond ((null? dirs)
;; The inputs are all files.
(format (current-error-port)
- "~%warning: collision encountered:~%~{~a~%~}"
+ "~%warning: collision encountered:~%~{ ~a~%~}"
files)
(let ((file (first files)))
;; TODO: Implement smarter strategies.
- (format (current-error-port)
- "warning: arbitrarily choosing ~a~%"
- file)
+ (format (current-error-port) "warning: choosing ~a~%" file)
(symlink* file output)))