From c065c443a03960b6d535783ac68f9cff3236d262 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 30 Oct 2013 21:43:37 +0100 Subject: union: Make the log port a parameter. * guix/build/union.scm (union-build): Add 'log-port' keyword parameter; use it. --- guix/build/union.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/build/union.scm b/guix/build/union.scm index 077b7fe530..0f8c87e171 100644 --- a/guix/build/union.scm +++ b/guix/build/union.scm @@ -100,7 +100,8 @@ (define non-collisions ,@(map loop dirs)))) (leaf leaf)))) -(define* (union-build output directories) +(define* (union-build output directories + #:key (log-port (current-error-port))) "Build in the OUTPUT directory a symlink tree that is the union of all the DIRECTORIES." (define (file-tree dir) @@ -174,6 +175,8 @@ (define (resolve-collision leaves) (setvbuf (current-output-port) _IOLBF) (setvbuf (current-error-port) _IOLBF) + (when (file-port? log-port) + (setvbuf log-port _IOLBF)) (mkdir output) (let loop ((tree (delete-duplicate-leaves @@ -189,8 +192,7 @@ (define (resolve-collision leaves) ;; A leaf: create a symlink. (let* ((dir (string-join dir "/")) (target (string-append output "/" dir "/" (basename tree)))) - (format (current-error-port) "`~a' ~~> `~a'~%" - tree target) + (format log-port "`~a' ~~> `~a'~%" tree target) (symlink tree target))) (((? string? subdir) leaves ...) ;; A sub-directory: create it in OUTPUT, and iterate over LEAVES. -- cgit v1.2.3