From 960c6ce96d746cf19829ad26e092ec5dad2a5c62 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 3 Jul 2017 23:35:56 +0200
Subject: 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.
---
 tests/discovery.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'tests')

diff --git a/tests/discovery.scm b/tests/discovery.scm
index 04de83f085..753e6a8979 100644
--- a/tests/discovery.scm
+++ b/tests/discovery.scm
@@ -19,6 +19,7 @@
 (define-module (test-discovery)
   #:use-module (guix discovery)
   #:use-module (guix build-system)
+  #:use-module (guix utils)
   #:use-module (srfi srfi-64)
   #:use-module (ice-9 match))
 
@@ -32,6 +33,19 @@ (define %top-srcdir
     ((('guix 'import _ ...) ..1)
      #t)))
 
+(test-assert "scheme-modules recurses in symlinks to directories"
+  (call-with-temporary-directory
+   (lambda (directory)
+     (mkdir (string-append directory "/guix"))
+     (symlink (string-append %top-srcdir "/guix/import")
+              (string-append directory "/guix/import"))
+
+     ;; DIRECTORY/guix/import is a symlink but we want to make sure
+     ;; 'scheme-modules' recurses into it.
+     (match (map module-name (scheme-modules directory))
+       ((('guix 'import _ ...) ..1)
+        #t)))))
+
 (test-equal "scheme-modules, non-existent directory"
   '()
   (scheme-modules "/does/not/exist"))
-- 
cgit v1.2.3