[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: environment: Improve error reporting for '-l'.
From: |
Ludovic Courtès |
Subject: |
05/05: environment: Improve error reporting for '-l'. |
Date: |
Tue, 30 Jun 2015 21:41:31 +0000 |
civodul pushed a commit to branch wip-environment
in repository guix.
commit aa02c535fc9bcadafa0d4e844fdc21015e4b17bc
Author: Ludovic Courtès <address@hidden>
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))))
- branch wip-environment created (now aa02c53), Ludovic Courtès, 2015/06/30
- 01/05: tests: Add tests for 'guix environment'., Ludovic Courtès, 2015/06/30
- 03/05: environment: Add --system., Ludovic Courtès, 2015/06/30
- 05/05: environment: Improve error reporting for '-l'.,
Ludovic Courtès <=
- 02/05: environment: Add only the specified outputs of the dependencies., Ludovic Courtès, 2015/06/30
- 04/05: environment: For --ad-hoc, allow users to specify an output., Ludovic Courtès, 2015/06/30