From patchwork Tue Jan 19 15:47:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 26500 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 53D0327BC15; Tue, 19 Jan 2021 16:12:50 +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 0751B27BC14 for ; Tue, 19 Jan 2021 16:12:50 +0000 (GMT) Received: from localhost ([::1]:53466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1tcf-0005x7-1s for patchwork@mira.cbaines.net; Tue, 19 Jan 2021 11:12:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1tEi-0008E2-6T for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1tEh-000706-VR for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1tEh-0004wT-U3 for guix-patches@gnu.org; Tue, 19 Jan 2021 10:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45984] [PATCH 4/5] import: cran: Return 'values'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Jan 2021 15:48:03 +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.161107126118923 (code B ref 45984); Tue, 19 Jan 2021 15:48:03 +0000 Received: (at 45984) by debbugs.gnu.org; 19 Jan 2021 15:47:41 +0000 Received: from localhost ([127.0.0.1]:51354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEK-0004v8-Uz for submit@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:41 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:51417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1tEE-0004u2-Lx for 45984@debbugs.gnu.org; Tue, 19 Jan 2021 10:47:35 -0500 Received: by mail-wm1-f41.google.com with SMTP id m2so195038wmm.1 for <45984@debbugs.gnu.org>; Tue, 19 Jan 2021 07:47:34 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=WRhpWcjlOTt/x2TrFuJdf5lIoaWafkVdqT10cdiYjQA=; b=Qu22gATN78U3LDDCQHeCpkrQEYMoVetr46ke1ldH/8fTmXB3UmvN5zSP/SwgkrR0Rk RPrukUjpmdGdVzcxYJ971zxBXgc1/T6ZTHXuRteycoWZe3W4jlgK6OPB8RCJKx4Tep0q e767/g3DvC6z12rVtS9lxahYnXlRGFrwrnQAVfW6TLVTL07Dh+/jeXIDQ1szh44MNx4o C8xysX7DBX48pBksYVc03skMBTbT7DjkCW+gCiQr+b1kbdRaiF3qlFz2850ilurxDFFW sMvj1T3+X/ncyMMZ1Oo38uz0MOxBg7Xf4kU6kpYTBkwVNy6vfdY1SchJBpoAKzGIkwe7 AWwg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WRhpWcjlOTt/x2TrFuJdf5lIoaWafkVdqT10cdiYjQA=; b=p9hMep0Dw/JooJZUHJ+Lj+iIAvZ5eEpPjiCUVU0ftHJ0A3HvXtGkO2rcfhFF6y+J2m dFlUGf6s/5clDuWHtrV6Hk/I7u8bgFGiotaycN7S1pj7ynP+w5Xgza7BCUh9LIDjUjjI NYUYGeIodj78y0IMX9cRTMa9UGRG/ApdPkv0/4pKh8bX0LcB8Sn39Ga4qouWaUvpXR7H utUIm3TuHyEaVEz4Iup8mYcEqI9ciWrJjtlzeCDWoSq32pmfSfpXrat9mNEVE30HiEek mdCsDs6BHZ/sf2BluEwTiz649MmUPjOuixkbB4yIZlJ2eRy2CATySROlEKrNBdlDtxA6 1Nvg== X-Gm-Message-State: AOAM530ZfWToRZPBQN0NOlHTeJp252nW2mjpZTUU/J/xRIXdrT3RHcvF UfueJ94hr29DBoEQ+67ZDMVkTsmDCdM= X-Google-Smtp-Source: ABdhPJyCBD3H9vtS6L+/MJaizxturDF1Kbbw6YT/uy+SB5MjdWl2dkSztheQVe/bIYeU9lcuV2165A== X-Received: by 2002:a7b:cbd5:: with SMTP id n21mr248833wmi.5.1611071249114; Tue, 19 Jan 2021 07:47:29 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 07:47:28 -0800 (PST) From: zimoun Date: Tue, 19 Jan 2021 16:47:20 +0100 Message-Id: <20210119154721.11999-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119154721.11999-1-zimon.toutoune@gmail.com> References: <20210119154721.11999-1-zimon.toutoune@gmail.com> 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 (cran->guix-package): Return 'values'. --- guix/import/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index fd44d80915..79fc2af5c6 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -601,9 +602,7 @@ s-expression corresponding to that package, or #f on failure." ;; Retry import from CRAN (cran->guix-package package-name #:repo 'cran)) (else - (raise (condition - (&message - (message "couldn't find meta-data for R package"))))))))))) + (values #f '())))))))) (define* (cran-recursive-import package-name #:key (repo 'cran)) (recursive-import package-name