From efb107e0cd34fa0ed656441bf6e2414253c0344a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 8 Mar 2016 11:48:21 +0100 Subject: packages: Gracefully report packages not found. Fixes a thinko introduced in 1b846da8c372bee78851439fd9e72b2499115e5a that would lead to a backtrace when looking for an unknown package. * gnu/packages.scm (%find-package): Correct logic when checking for FALLBACK?. --- gnu/packages.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages.scm') diff --git a/gnu/packages.scm b/gnu/packages.scm index 5a76e9b9ef..bbd460a083 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -300,13 +300,15 @@ use NAME@VERSION instead~%"))) (_ (if 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 ;; between NAME and VERSION, for backward compatibility. (call-with-values (lambda () (hyphen-separated-name->name+version name)) (cut %find-package spec <> <> #:fallback? #t)) + + ;; The fallback case didn't find anything either, so bail out. (leave (_ "~A: unknown package~%") name)))))) (define (specification->package spec) -- cgit v1.2.3