me
/
guix
Archived
1
0
Fork 0
Code

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

* guix/gexp.scm (directory-union): Add #:quiet? and honor it.
master
Ludovic Courtès 2017-10-19 16:10:18 +02:00
parent 59523429d6
commit de98b302a1
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/gexp.scm
View File

@ -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)))))))))