unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: zimoun <zimon.toutoune@gmail.com>
To: 45984@debbugs.gnu.org
Subject: [bug#45984] [PATCH 1/5] import: pypi: Return 'values'.
Date: Tue, 19 Jan 2021 16:47:17 +0100	[thread overview]
Message-ID: <20210119154721.11999-1-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20210119154525.11230-1-zimon.toutoune@gmail.com>

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





  reply	other threads:[~2021-01-19 16:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-19 15:45 [bug#45984] [PATCH 0/5] Fix recursive importers zimoun
2021-01-19 15:47 ` zimoun [this message]
2021-01-19 15:47   ` [bug#45984] [PATCH 2/5] import: hackage: Return 'values' zimoun
2021-01-19 15:47   ` [bug#45984] [PATCH 3/5] import: elpa: " zimoun
2021-01-19 15:47   ` [bug#45984] [PATCH 4/5] import: cran: " zimoun
2021-01-19 15:47   ` [bug#45984] [PATCH 5/5] scripts: import: gem: Fix recursive error handling zimoun
2021-01-26 22:24 ` [bug#45984] [PATCH 0/5] Fix recursive importers Ludovic Courtès
2021-01-26 23:16   ` zimoun
2021-01-28 13:22     ` Ludovic Courtès
2021-01-28 22:07       ` zimoun
2022-03-07 21:52 ` bug#45984: " Ludovic Courtès
2022-03-08  8:36   ` [bug#45984] " zimoun

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=20210119154721.11999-1-zimon.toutoune@gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=45984@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).