From c6e030b2e3965222e6bb27306311aaec9c7ae93c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Mon, 5 Oct 2015 21:38:19 -0500 Subject: utils: Have search-path-as-list pattern search for directories. * guix/build/utils.scm (search-path-as-list)[pattern]: Check requested file type. Check pattern against directory names. * guix/search-paths.scm (evaluate-search-paths)[pattern]: Remove symlink hack. --- guix/search-paths.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'guix/search-paths.scm') diff --git a/guix/search-paths.scm b/guix/search-paths.scm index 7fd15d440c..7a6fe67959 100644 --- a/guix/search-paths.scm +++ b/guix/search-paths.scm @@ -139,12 +139,6 @@ report only settings not already effective." (let* ((values (or (and=> (getenv variable) (cut string-tokenize* <> separator)) '())) - ;; Add a trailing slash to force symlinks to be treated as - ;; directories when 'find-files' traverses them. - (files (if pattern - (map (cut string-append <> "/") files) - files)) - ;; XXX: Silence 'find-files' when it stumbles upon non-existent ;; directories (see ;; .) -- cgit v1.2.3