02/07: gexp: 'directory-union' has a #:quiet? parameter.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit de98b302a1794365ee88e2d78c5afff9296054b8
Author: Ludovic Courtès <address@hidden>
Date:   Thu Oct 19 16:10:18 2017 +0200

    gexp: 'directory-union' has a #:quiet? parameter.
    
    * guix/gexp.scm (directory-union): Add #:quiet? and honor it.
---
 guix/gexp.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index e8ac3dc..3781a1e 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1205,7 +1205,7 @@ This yields an 'etc' directory containing these two 
files."
                           files))))))
 
 (define* (directory-union name things
-                          #:key (copy? #f))
+                          #:key (copy? #f) (quiet? #f))
   "Return a directory that is the union of THINGS, where THINGS is a list of
 file-like objects denoting directories.  For example:
 
@@ -1213,7 +1213,8 @@ file-like objects denoting directories.  For example:
 
 yields a directory that is the union of the 'guile' and 'emacs' packages.
 
-When COPY? is true, copy files instead of creating symlinks."
+When HARD-LINKS? is true, create hard links instead of symlinks.  When QUIET?
+is true, the derivation will not print anything."
   (define symlink
     (if copy?
         (gexp (lambda (old new)
@@ -1222,6 +1223,11 @@ When COPY? is true, copy files instead of creating 
symlinks."
                     (copy-file old new))))
         (gexp symlink)))
 
+  (define log-port
+    (if quiet?
+        (gexp (%make-void-port "w"))
+        (gexp (current-error-port))))
+
   (match things
     ((one)
      ;; Only one thing; return it.
@@ -1234,6 +1240,7 @@ When COPY? is true, copy files instead of creating 
symlinks."
                               (union-build (ungexp output)
                                            '(ungexp things)
 
+                                           #:log-port (ungexp log-port)
                                            #:symlink (ungexp symlink)))))))))