aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-30 23:31:24 +0200
committerLudovic Courtès <ludo@gnu.org>2015-07-01 23:29:49 +0200
commitd70389c423101d9ee26937e5d63945ac228fe6ee (patch)
tree83767d7e4dda57f7ec3b1f9493880fb17165fb53
parent417c39f13291711aa86ffd3479651e4521a93eac (diff)
downloadguix-d70389c423101d9ee26937e5d63945ac228fe6ee.tar
guix-d70389c423101d9ee26937e5d63945ac228fe6ee.tar.gz
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'.
-rw-r--r--guix/scripts/environment.scm2
1 files changed, 1 insertions, 1 deletions
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 @@ packages."
(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))))