civodul pushed a commit to branch wip-environment
in repository guix.
commit aa02c535fc9bcadafa0d4e844fdc21015e4b17bc
Author: Ludovic Courtès <[email protected]>
Date: Tue Jun 30 23:31:24 2015 +0200
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 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index c0a7da1..00c4df7 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))))
