nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utils: 'find-files' does not follow symlinks by default. 

Fixes <http://bugs.gnu.org/20081>.
Reported by Tomáš Čech <sleep_walker@suse.cz>.

* guix/build/utils.scm (find-files): Add #:stat parameter.  Pass it as
  last argument to 'file-system-fold'.
This commit is contained in:
Ludovic Courtès 2015-04-06 23:09:54 +02:00
parent e081385af2
commit 347f54ed33
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/build/utils.scm
View File

@ -278,12 +278,14 @@ name matches REGEXP."
(lambda (file stat)
(regexp-exec file-rx (basename file)))))
(define* (find-files dir #:optional (pred (const #t)))
(define* (find-files dir #:optional (pred (const #t))
#:key (stat lstat))
"Return the lexicographically sorted list of files under DIR for which PRED
returns true. PRED is passed two arguments: the absolute file name, and its
stat buffer; the default predicate always returns true. PRED can also be a
regular expression, in which case it is equivalent to (file-name-predicate
PRED)."
PRED). STAT is used to obtain file information; using 'lstat' means that
symlinks are not followed."
(let ((pred (if (procedure? pred)
pred
(file-name-predicate pred))))
@ -304,7 +306,8 @@ PRED)."
file (strerror errno))
result)
'()
dir)
dir
stat)
string<?)))