From 03856dce4ed1d3f76978f7e88bbf2012a4539d1b Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Mon, 24 Apr 2023 17:51:18 +0200 Subject: scripts: import: crate: Handle non-existent package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * guix/scripts/import/crate.scm (guix-import-crate): Handle non-existent package input. Signed-off-by: Ludovic Courtès --- guix/scripts/import/crate.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index 97152904ac..038faa87db 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,15 +91,16 @@ (define (parse-options) (define-values (name version) (package-name->name+version spec)) - (if (assoc-ref opts 'recursive) - (crate-recursive-import name #:version version) - (let ((sexp (crate->guix-package name #:version version #:include-dev-deps? #t))) - (unless sexp - (leave (G_ "failed to download meta-data for package '~a'~%") - (if version - (string-append name "@" version) - name))) - (list sexp)))) + (match (if (assoc-ref opts 'recursive) + (crate-recursive-import name #:version version) + (crate->guix-package name #:version version #:include-dev-deps? #t)) + ((or #f '()) + (leave (G_ "failed to download meta-data for package '~a'~%") + (if version + (string-append name "@" version) + name))) + ((? list? sexps) sexps) + (sexp (list sexp)))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- cgit v1.2.3