From patchwork Tue Jan 19 15:47:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26498 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 926A827BC15; Tue, 19 Jan 2021 16:00:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0EE1C27BC14 for ; Tue, 19 Jan 2021 16:00:53 +0000 (GMT) Received: from localhost ([::1]:34244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tR6-0004wd-4w for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 11:00:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1tEh-0008De-0S for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1tEg-0006zr-Po for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1tEg-0004w7-OJ for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45984] [PATCH 1/5] import: pypi: Return 'values'. References: <20210119154525.11230-1-zimon.toutoune@gmail.com> In-Reply-To: <20210119154525.11230-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45984 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45984@debbugs.gnu.org Received: via spool by 45984-submit@debbugs.gnu.org id=B45984.161107125518887 (code B ref 45984); Tue, 19 Jan 2021 15:48:02 +0000 Received: (at 45984) by debbugs.gnu.org; 19 Jan 2021 15:47:35 +0000 Received: from localhost ([127.0.0.1]:51347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEE-0004uS-Qf for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:35 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:40152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEB-0004tt-IT for 45984@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:32 -0500 Received: by mail-wm1-f52.google.com with SMTP id c127so171303wmf.5 for <45984@debbugs.gnu.org>; Tue, 19 Jan 2021 07:47:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oVb+OK2YvVx0wdk5foNYvo9Uy6fXu+eoDlepggIgEqM=; b=KXnKbGPyyvBPetDRiqlzrHnjRk5vEfvXd2x6tutM//z1JmlY2QgEvEzYCw2yL4UYBU 2bMpRhV1Uy/mdazZaip8+DzVVxT2y1+83kPM4mD1MUsQqhVZf3/1pR6pyoG5E9iMGiAP pR3JxS1XIAQRRy3ylX/9WjBx2yRGFkBKYA2X/aoZaF/SX0DMsMqlVs5WQqC8pp5B77XZ YXa2Ruc3htNDOkbBly8GGEcBJT1yU0fnnDQMC/IfRvMnsRNxrtdOid/hH0+5mrDuipKE /n9ZuDc8KFR/01ECSqXHMXQFf/Wwt/nXufOtUXcTAmGLSaeXt7eIsg+e5edr64oIKfX1 DK9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oVb+OK2YvVx0wdk5foNYvo9Uy6fXu+eoDlepggIgEqM=; b=FPNI4ta9GWoXkafMYUB10y6kH1xhNscyXzkVmsKzHSgK8lAVrS7y58RwUrQ7U1bat0 6FOARRnBckfF0DzeeNwr4l75rZVsisLL4pIg/B0Np1zYFytJFrekKsb0PXwxcEatRkDY RrLE8PQVO2tB/jcTZzfWlxxvmA/mbI3jBkC2kW6CEQpEt6CWhMlP9dDjPi1u3KDW5Ajj l/Z/cn+bveX5D1egnyD88Ntg0velNN2EJGnUWTnIFUmDKM50QAsKXpNxliZEPzZSirku 9ddtnxQknhz/SYlNpaeOa5/BMsS0WeM5Cejv2oawh7jgA7ptIRq6wydoIdy5QAtHNR/o TXiA== X-Gm-Message-State: AOAM530kaIzchY0SMFdahwTdtlQaEi5G87m+Oex37MN02HHBvkUjF++B aP/bsfBMBNRq7Mxeqrmws3s+htyC5F8= X-Google-Smtp-Source: ABdhPJwVatYNjMo3m//IRzq2dcOqjMaDsBIe3ZZyhvfRnywfnhvPSLJqPtLqiA2wopPeWxHd9cSMpg== X-Received: by 2002:a1c:4d13:: with SMTP id o19mr237015wmh.3.1611071245633; Tue, 19 Jan 2021 07:47:25 -0800 (PST) Received: from lili.univ-paris-diderot.fr ([88.126.110.68]) by smtp.gmail.com with ESMTPSA id o14sm34279778wri.48.2021.01.19.07.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:47:25 -0800 (PST) From: zimoun Date: Tue, 19 Jan 2021 16:47:17 +0100 Message-Id: <20210119154721.11999-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Fixes partially . * 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 ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Simon Tournier ;;; ;;; 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