diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-07-03 23:35:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-07-03 23:51:23 +0200 |
| commit | 960c6ce96d746cf19829ad26e092ec5dad2a5c62 (patch) | |
| tree | 81894ab71d17bc3995507acf4654af5379d7bac1 /guix/discovery.scm | |
| parent | cc1dfc202f2fefb6c2eb9467d1fc90a9154550c9 (diff) | |
discovery: Recurse into directories pointed to by a symlink.
Reported by Christopher Baines <mail@cbaines.net>
and Alex Kost <alezost@gmail.com>
at <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00290.html>.
* guix/discovery.scm (scheme-files): When ENTRY is a symlink that
doesn't end in '.scm', call 'stat' and recurse if it points to a
directory.
* tests/discovery.scm ("scheme-modules recurses in symlinks to
directories"): New test.
Diffstat (limited to 'guix/discovery.scm')
| -rw-r--r-- | guix/discovery.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/guix/discovery.scm b/guix/discovery.scm index 292df2bd9c..2741725b9d 100644 --- a/guix/discovery.scm +++ b/guix/discovery.scm @@ -60,11 +60,21 @@ DIRECTORY is not accessible." (case (entry-type absolute properties) ((directory) (append (scheme-files absolute) result)) - ((regular symlink) - ;; XXX: We don't recurse if we find a symlink. + ((regular) (if (string-suffix? ".scm" name) (cons absolute result) result)) + ((symlink) + (cond ((string-suffix? ".scm" name) + (cons absolute result)) + ((stat absolute #f) + => + (match-lambda + (#f result) + ((= stat:type 'directory) + (append (scheme-files absolute) + result)) + (_ result))))) (else result)))))) '() |