03/05: union: Slightly improve messages for file collisions.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit f8d13038645e635634469b673bcc20d87c91b913
Author: Ludovic Courtès <address@hidden>
Date:   Sat Mar 31 23:18:29 2018 +0200

    union: Slightly improve messages for file collisions.
    
    * guix/build/union.scm (union-build): Indent file names upon collision.
    Remove "arbitrarily" from the message.
---
 guix/build/union.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/guix/build/union.scm b/guix/build/union.scm
index d46b750..5f1cf8e 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 <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2018 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2014 Mark H Weaver <address@hidden>
 ;;; Copyright © 2017 Huang Ying <address@hidden>
 ;;;
@@ -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)))