From f8d13038645e635634469b673bcc20d87c91b913 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 31 Mar 2018 23:18:29 +0200 Subject: 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(-) (limited to 'guix/build') 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 +;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2017 Huang Ying ;;; @@ -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))) -- cgit v1.2.3