From d26e19671e2a50a25d37357aba301bef5df1818e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 22 Mar 2016 15:00:53 +0100 Subject: derivations: Raise an error when a module file is not found. Suggested by Jookia. * guix/derivations.scm (&file-search-error): New error condition. (search-path*): Raise it when 'search-path' returns #f. * guix/gexp.scm (search-path*): Remove. * guix/ui.scm (call-with-error-handling): Add case for 'file-search-error?'. * tests/derivations.scm ("build-expression->derivation and invalid module name"): New test. --- guix/gexp.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'guix/gexp.scm') diff --git a/guix/gexp.scm b/guix/gexp.scm index c408c94c43..b4d737ecae 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -902,11 +902,6 @@ system, imported, and appears under FINAL-PATH in the resulting store path." #:guile-for-build guile #:local-build? #t))) -(define search-path* - ;; A memoizing version of 'search-path' so 'imported-modules' does not end - ;; up looking for the same files over and over again. - (memoize search-path)) - (define* (imported-modules modules #:key (name "module-import") (system (%current-system)) -- cgit v1.2.3