utils: 'find-files' returns a sorted list.
* guix/build/utils.scm (find-files): Sort the result lexicographically. * guix/scripts/pull.scm (unpack): Don't sort the result of 'find-files'.
This commit is contained in:
parent
8ce3104e0e
commit
66018f1c33
|
@ -185,13 +185,15 @@ but ignore errors."
|
|||
lstat))
|
||||
|
||||
(define (find-files dir regexp)
|
||||
"Return the list of files under DIR whose basename matches REGEXP."
|
||||
"Return the lexicographically sorted list of files under DIR whose basename
|
||||
matches REGEXP."
|
||||
(define file-rx
|
||||
(if (regexp? regexp)
|
||||
regexp
|
||||
(make-regexp regexp)))
|
||||
|
||||
(file-system-fold (const #t)
|
||||
;; Sort the result to get deterministic results.
|
||||
(sort (file-system-fold (const #t)
|
||||
(lambda (file stat result) ; leaf
|
||||
(if (regexp-exec file-rx (basename file))
|
||||
(cons file result)
|
||||
|
@ -207,7 +209,8 @@ but ignore errors."
|
|||
file (strerror errno))
|
||||
#f)
|
||||
'()
|
||||
dir))
|
||||
dir)
|
||||
string<?))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
|
@ -116,9 +116,7 @@ files."
|
|||
;; download), we must build it first to avoid errors since
|
||||
;; (gnutls) is unavailable.
|
||||
(cons (string-append out "/guix/build/download.scm")
|
||||
|
||||
;; Sort the file names to get deterministic results.
|
||||
(sort (find-files out "\\.scm") string<?)))
|
||||
(find-files out "\\.scm")))
|
||||
|
||||
;; Remove the "fake" (guix config).
|
||||
(delete-file (string-append out "/guix/config.scm"))
|
||||
|
|
Loading…
Reference in New Issue