unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Simon Tournier <zimon.toutoune@gmail.com>
To: 63053@debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune@gmail.com>
Subject: [bug#63053] [PATCH 2/3] scripts: import: crate: Handle non-existent package.
Date: Mon, 24 Apr 2023 17:51:18 +0200	[thread overview]
Message-ID: <20230424155119.1540974-2-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20230424155119.1540974-1-zimon.toutoune@gmail.com>

Fixes <https://bugs/gnu.org/63020>.

* guix/scripts/import/crate.scm (guix-import-crate): Handle non-existent
package input.
---
 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 <david@craven.ch>
 ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; 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 ...)
-- 
2.38.1





  reply	other threads:[~2023-04-24 15:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-24 15:48 [bug#63053] [PATCH 0/3] Fix "guix import crate" Simon Tournier
2023-04-24 15:51 ` [bug#63053] [PATCH 1/3] guix: import: crate: Fix incorrect returned values Simon Tournier
2023-04-24 15:51   ` Simon Tournier [this message]
2023-04-24 15:51   ` [bug#63053] [PATCH 3/3] gnu: guix: Add guile-semver Simon Tournier
2023-04-30 21:09 ` bug#63053: [PATCH 0/3] Fix "guix import crate" Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230424155119.1540974-2-zimon.toutoune@gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=63053@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).