[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45984] [PATCH 1/5] import: pypi: Return 'values'.
From: |
zimoun |
Subject: |
[bug#45984] [PATCH 1/5] import: pypi: Return 'values'. |
Date: |
Tue, 19 Jan 2021 16:47:17 +0100 |
Fixes partially <https://bugs.gnu.org/44115>.
* guix/import/pypi.scm (pypi->guix-package): Exhaustive 'values' return.
---
guix/import/pypi.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index bf4dc50138..56f4f3f589 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -477,12 +478,10 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION,
and LICENSE."
`package' s-expression corresponding to that package, or #f on failure."
(let* ((project (pypi-fetch package-name))
(info (and project (pypi-project-info project))))
- (and project
+ (if project
(guard (c ((missing-source-error? c)
(let ((package (missing-source-error-package c)))
- (leave (G_ "no source release for pypi package ~a
~a~%")
- (project-info-name info)
- (project-info-version info)))))
+ (values #f '()))))
(make-pypi-sexp (project-info-name info)
(project-info-version info)
(and=> (latest-source-release project)
@@ -493,7 +492,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and
LICENSE."
(project-info-summary info)
(project-info-summary info)
(string->license
- (project-info-license info)))))))))
+ (project-info-license info))))
+ (values #f '()))))))
(define (pypi-recursive-import package-name)
(recursive-import package-name
--
2.29.2