From d81701a85aa8aa96f4a853f06fe28693fa8bee12 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 15 May 2023 19:45:45 +0200 Subject: scripts: import: elpa: Return consistent error code. Fixes . Reported by Ricardo Wurmus. * guix/scripts/import/elpa.scm (guix-import-elpa): Return consistent error code independently of the 'recursive' option. Signed-off-by: Josselin Poiret --- guix/scripts/import/elpa.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'guix/scripts/import') diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm index a71478d3c8..f587eeb243 100644 --- a/guix/scripts/import/elpa.scm +++ b/guix/scripts/import/elpa.scm @@ -97,20 +97,21 @@ Import the latest package named PACKAGE-NAME from an ELPA repository.\n")) (package-name->name+version spec)) (when version (warning (G_ "this importer does not consider the version~%"))) - (if (assoc-ref opts 'recursive) - (with-error-handling - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) + (match (if (assoc-ref opts 'recursive) (elpa-recursive-import package-name - (or (assoc-ref opts 'repo) 'gnu)))) - (let ((sexp (elpa->guix-package package-name - #:repo (assoc-ref opts 'repo)))) - (unless sexp - (leave (G_ "failed to download package '~a'~%") package-name)) - sexp))) + (or (assoc-ref opts 'repo) 'gnu)) + (elpa->guix-package package-name + #:repo (assoc-ref opts 'repo))) + ((or #f '()) + (leave (G_ "failed to download meta-data for package '~a'~%") package-name)) + (('package etc ...) `(package ,etc)) + ((? list? sexps) (map + (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + sexps)))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- cgit v1.2.3