[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/15: scripts: import: crate: Handle non-existent package.
From: |
guix-commits |
Subject: |
07/15: scripts: import: crate: Handle non-existent package. |
Date: |
Sun, 30 Apr 2023 17:22:13 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 03856dce4ed1d3f76978f7e88bbf2012a4539d1b
Author: Simon Tournier <zimon.toutoune@gmail.com>
AuthorDate: Mon Apr 24 17:51:18 2023 +0200
scripts: import: crate: Handle non-existent package.
Fixes <https://bugs/gnu.org/63020>.
* guix/scripts/import/crate.scm (guix-import-crate): Handle non-existent
package input.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
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 @@ Import and convert the crates.io package for
PACKAGE-NAME.\n"))
(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 ...)
- branch master updated (a27e0d4533 -> 08675129aa), guix-commits, 2023/04/30
- 05/15: guix: import: crate: Fix incorrect returned values., guix-commits, 2023/04/30
- 01/15: import: pypi: Adjust tests for new build system., guix-commits, 2023/04/30
- 02/15: gnu: Add diffpdf., guix-commits, 2023/04/30
- 07/15: scripts: import: crate: Handle non-existent package.,
guix-commits <=
- 04/15: gnu: Add chicken-srfi-18., guix-commits, 2023/04/30
- 08/15: system: guix: Use config's ACL file location., guix-commits, 2023/04/30
- 03/15: gnu: Add chicken-compile-file., guix-commits, 2023/04/30
- 09/15: installer: Filter out C.UTF-8 from the list of locales., guix-commits, 2023/04/30
- 11/15: gnu: mumi: Add guile-gnutls to inputs., guix-commits, 2023/04/30
- 12/15: gnu: slim: Fix build failure with GCC-11, guix-commits, 2023/04/30
- 14/15: gnu: plover: Fix build., guix-commits, 2023/04/30
- 06/15: gnu: guix: Add guile-semver., guix-commits, 2023/04/30
- 10/15: doc: Add --sysconfdir=/etc to the recommended ./configure., guix-commits, 2023/04/30
- 13/15: gnu: slim: Update homepage., guix-commits, 2023/04/30