From d70389c423101d9ee26937e5d63945ac228fe6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Jun 2015 23:31:24 +0200 Subject: [PATCH] environment: Improve error reporting for '-l'. This fixes two problems: 1. Load errors would print an ugly backtrace. 2. When FILE was an absolute name, 'load' was passed an incorrect file name. * guix/scripts/environment.scm (options/resolve-packages): Use 'load*' instead of 'load'. --- guix/scripts/environment.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index c0a7da171e..00c4df7a3e 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -200,7 +200,7 @@ (define (options/resolve-packages opts) (package-outputs package))))) (('load . file) ;; Add all the outputs of the package defined in FILE. - (let ((package (load (string-append (getcwd) "/" file)))) + (let ((package (load* file (make-user-module '())))) (map (lambda (output) `(package ,package ,output)) (package-outputs package))))