ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages: Gracefully report packages not found.

Browse source 
Fixes a thinko introduced in 1b846da8c3
that would lead to a backtrace when looking for an unknown package.

* gnu/packages.scm (%find-package): Correct logic when checking for
FALLBACK?.
This commit is contained in:
Ludovic Courtès 2016-03-08 11:48:21 +01:00
parent 95cd4971d0
commit efb107e0cd
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages.scm
View file

@ -300,13 +300,15 @@ (define* (%find-package spec name version #:key fallback?)
(_ (_
(if version (if version
(leave (_ "~A: package not found for version ~a~%") name version) (leave (_ "~A: package not found for version ~a~%") name version)
(or fallback? (if (not fallback?)
;; XXX: Fallback to the older specification style with an hyphen ;; XXX: Fallback to the older specification style with an hyphen
;; between NAME and VERSION, for backward compatibility. ;; between NAME and VERSION, for backward compatibility.
(call-with-values (call-with-values
(lambda () (lambda ()
(hyphen-separated-name->name+version name)) (hyphen-separated-name->name+version name))
(cut %find-package spec <> <> #:fallback? #t)) (cut %find-package spec <> <> #:fallback? #t))
;; The fallback case didn't find anything either, so bail out.
(leave (_ "~A: unknown package~%") name)))))) (leave (_ "~A: unknown package~%") name))))))
(define (specification->package spec) (define (specification->package spec)

9
tests/packages.scm
View file

@ -788,6 +788,15 @@ (define read-at
(guix-package "-p" (derivation->output-path prof) (guix-package "-p" (derivation->output-path prof)
"--search-paths")))))) "--search-paths"))))))
(test-equal "specification->package when not found"
'quit
(catch 'quit
(lambda ()
;; This should call 'leave', producing an error message.
(specification->package "this-package-does-not-exist"))
(lambda (key . args)
key)))
(test-end "packages") (test-end "packages")