TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

environment: Improve error reporting for '-l'.

Browse source 
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'.
This commit is contained in:
Ludovic Courtès 2015-06-30 23:31:24 +02:00
parent 417c39f132
commit d70389c423
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
guix/scripts/environment.scm
View file

@ -200,7 +200,7 @@ (define (options/resolve-packages opts)
(package-outputs package))))) (package-outputs package)))))
(('load . file) (('load . file)
;; Add all the outputs of the package defined in 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) (map (lambda (output)
`(package ,package ,output)) `(package ,package ,output))
(package-outputs package)))) (package-outputs package))))