From patchwork Mon Jun 28 16:20:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 30762 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 3693227BC81; Mon, 28 Jun 2021 17:21:14 +0100 (BST) 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,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 F277C27BC78 for ; Mon, 28 Jun 2021 17:21:13 +0100 (BST) Received: from localhost ([::1]:45692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxu0W-0004o4-Pe for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 12:21:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxu0N-0004lD-9r for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxu0N-0000Tm-0D for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxu0M-0005Wd-R0 for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49196] [PATCH v4 1/3] import: go: Return false for package not found. References: <07d7149fc0f89f7f2d11fba47e1b0b2db5ceb809.1624479231.git.iskarian@mgsn.dev> In-Reply-To: <07d7149fc0f89f7f2d11fba47e1b0b2db5ceb809.1624479231.git.iskarian@mgsn.dev> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 16:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49196@debbugs.gnu.org Cc: iskarian@mgsn.dev Received: via spool by 49196-submit@debbugs.gnu.org id=B49196.162489723521142 (code B ref 49196); Mon, 28 Jun 2021 16:21:02 +0000 Received: (at 49196) by debbugs.gnu.org; 28 Jun 2021 16:20:35 +0000 Received: from localhost ([127.0.0.1]:52329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtzr-0005Un-UK for submit@debbugs.gnu.org; Mon, 28 Jun 2021 12:20:35 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:40769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtzp-0005UU-Hd for 49196@debbugs.gnu.org; Mon, 28 Jun 2021 12:20:29 -0400 Received: by mail-wr1-f49.google.com with SMTP id g7so17360637wri.7 for <49196@debbugs.gnu.org>; Mon, 28 Jun 2021 09:20:29 -0700 (PDT) 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=xyfzeGHjgYipDP017Y3vpgziAEjuDkbsOhIFiawVpP0=; b=crmwLD4l1byqZsAm5RleM2fxg6pYz7kvI6Bn1EmMKab5b28hJyrzPRNtUIVuo/CiN7 On9qEqq4j3I9COG8B/aCcvshtt0T0dRum9dsT0QhGEqI3LXMBPnT/NxMbZxEjb/WEuL2 DEWjFwGhVX4tJfhY5EhotMHov5HpjdAcCTvrEFPDZvj16kV7vHLAHuR6r8nan6oI8/gO QXzTcZrGYNhi/0OhQrE162wT15YTLtMm3tHFMnlwco8q94fnfG2qCKP86IzPJpe4sol1 w2b6wwNsZwMISxm0j7OFpbBRQmGy54xrS09tS0nbbXUIfknQ1J2hHMQiAtYzMmRtsmJ2 +cFQ== 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=xyfzeGHjgYipDP017Y3vpgziAEjuDkbsOhIFiawVpP0=; b=lefwR+8LdUbE+Hto+avQTMOkVvPz4URnSMXH2N9QRG9+hJUwJApNn+oOwNhGspL8iD tdaMH+xJqWtQTPpgjNHKfVoRmC/xqEKmEpDtwRamGrAuGZ/O/qb2mZAVdHdmcl/Oy2Sr pEOqFh8QVqbo7DGDa8/jiRX0etyNjTT52RmDjl2BgxrTi/+Q2Tj7MbHZs7EFFiiT5/tz ql2l/R5zkR0jvLMZAxQvUuZWJPUBk/mKBOdQrGRQMGHuPfvUfSRW+nbhw2fd0sHUhg5k +s4homCv9hdnwpIlm7x2GxtaDIBpf3xE/AusvwS8WBxspv5d6BFwQAl0kqvRlZ1ZXgqt aetg== X-Gm-Message-State: AOAM533rM1SWqT8yK87BGzlFpmsNhh1NEItCVa2ojHycmuUpntIMgUrq DTcaJlwBLS5BpRPXxJHvLre8n3GoUAo= X-Google-Smtp-Source: ABdhPJwWL623Zy1dk36NXncqxW+uYn0lekxLyBz7TJwM/sU0yeJqSDSReld+fAsC9hJqmXcD0iqzDw== X-Received: by 2002:a5d:6992:: with SMTP id g18mr27909451wru.73.1624897223495; Mon, 28 Jun 2021 09:20:23 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id v18sm17050567wrv.24.2021.06.28.09.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:20:23 -0700 (PDT) From: zimoun Date: Mon, 28 Jun 2021 18:20:12 +0200 Message-Id: <20210628162014.15319-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 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 From: Sarah Morgensen * guix/import/go.scm (go-module-recursive-import): Explicitly return false when packages are not found. --- guix/import/go.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 77c9c5c103ed2d09a43709bb78bc0b13a399e797 diff --git a/guix/import/go.scm b/guix/import/go.scm index 5e23d6a2b3..a2863c79ad 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -653,7 +653,7 @@ This package and its dependencies won't be imported.~%") (uri->string (http-get-error-uri c)) (http-get-error-code c) (http-get-error-reason c)) - (values '() '()))) + (values #f '()))) (receive (package-sexp dependencies) (go-module->guix-package* name #:goproxy goproxy #:version version From patchwork Mon Jun 28 16:20:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 30764 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 12E5027BC81; Mon, 28 Jun 2021 17:24:28 +0100 (BST) 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,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 95CC027BC78 for ; Mon, 28 Jun 2021 17:24:27 +0100 (BST) Received: from localhost ([::1]:56440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxu3e-0003cO-Lk for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 12:24:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxu0N-0004lv-IT for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxu0N-0000UF-9i for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxu0N-0005Wl-79 for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49196] [PATCH v4 2/3] import: utils: Skip not found packages. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 16:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49196@debbugs.gnu.org Cc: iskarian@mgsn.dev Received: via spool by 49196-submit@debbugs.gnu.org id=B49196.162489723721150 (code B ref 49196); Mon, 28 Jun 2021 16:21:03 +0000 Received: (at 49196) by debbugs.gnu.org; 28 Jun 2021 16:20:37 +0000 Received: from localhost ([127.0.0.1]:52331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtzw-0005V4-Cr for submit@debbugs.gnu.org; Mon, 28 Jun 2021 12:20:37 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:38776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtzp-0005UV-Jp for 49196@debbugs.gnu.org; Mon, 28 Jun 2021 12:20:35 -0400 Received: by mail-wr1-f46.google.com with SMTP id r8so8204686wrx.5 for <49196@debbugs.gnu.org>; Mon, 28 Jun 2021 09:20:29 -0700 (PDT) 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=rty0ZqD+74SEHhUaLtCsSlBbmFKBoQTnN3k5Vftk+7k=; b=QGnuDnBzuU6Yo0rhapoQIUuzDIFTOtIzfTIzNGlYw8txbE8rnayWpl47QpplG4yFob Fsb95I4xBKe64ul7bZFJFLy5nvkkxM4zlyAfp1A3NQN+HV/k+XKUIfCoWDNLun8/345b VCg4CYdk9qktsCa6RgGmg8DJsvkCfsPDwNX9OLbs7hnFAGQB+j0pnp2Sg0O7cz/X7pZs aarou4FD9RCJWR3tizLmmLDBticLhpTFTn0yiDjPWNzaAJDxh4Mpm3+ZyHFzK0ZWcKso pW408AhSD4MZTCSyWXO7pBwxm5yrYh1xy1LN2FB0ryxNzjycwD/7yLsk434tgYPCofuq xZJA== 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=rty0ZqD+74SEHhUaLtCsSlBbmFKBoQTnN3k5Vftk+7k=; b=p5HOY1s5qyJSwoIuolaqfCqW8bdSEqBQJ8Yk17w0Rmu7dQitdht9sAkX0A5VLV3iMa gJy9DuKaHFOoeZR4o9nsbxAUnmkgmEbbH8MWNvtbcmh8Cu2NlS4VCGy9FbqY3dpJ+gqc VXoGmP48HOzuWtiiYGfpFNM2PKMmauoJruo7oAjl2Q/t+RmFWaiSIgdUy9IFgWhmiMyr cgOzc524j3K0bTvP23ppgHoqPcWNQhzniFbg8LL8MNbrxIU1msBj17ExwncMDmLBZqFu 97NYUDeqAhQt9AxxOC85W6mm4Sbn3Jp7V8xvltCJGTqy4KggiSgL/Bs0roNbK6lVYbQN RK0Q== X-Gm-Message-State: AOAM5334BBnsJrKXo7uaDRIP39EY5tfgxq8+9S9KvWEZ4z7TdyPX5Uf3 3dNIEtcG/wfAM5CtCeMw+B/L3zAxNmI= X-Google-Smtp-Source: ABdhPJz+s04ntMiKNgglNM3GXUWKW1YRF7NXCNBP+gfQTAGMCKbxCL6H7HbaVMgnQkmIMZblbIJFYg== X-Received: by 2002:adf:f690:: with SMTP id v16mr12259239wrp.411.1624897224033; Mon, 28 Jun 2021 09:20:24 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id v18sm17050567wrv.24.2021.06.28.09.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:20:23 -0700 (PDT) From: zimoun Date: Mon, 28 Jun 2021 18:20:13 +0200 Message-Id: <20210628162014.15319-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210628162014.15319-1-zimon.toutoune@gmail.com> References: <20210628162014.15319-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 From: Sarah Morgensen * guix/import/utils.scm (recursive-import): Skip packages when the package returned by 'repo->guix-package' is false. * tests/import-utils.scm: New tests. --- guix/import/utils.scm | 26 ++++++++++++++------------ tests/import-utils.scm | 28 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index d817318a91..7f2e7ecb46 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -471,15 +472,16 @@ to obtain the Guix package name corresponding to the upstream name." (name (list name #f))) dependencies))) (make-node name version package normalized-deps))) - (map node-package - (topological-sort (list (lookup-node package-name version)) - (lambda (node) - (map (lambda (name-version) - (apply lookup-node name-version)) - (remove (lambda (name-version) - (apply exists? name-version)) - (node-dependencies node)))) - (lambda (node) - (string-append - (node-name node) - (or (node-version node) "")))))) + (filter-map + node-package + (topological-sort (list (lookup-node package-name version)) + (lambda (node) + (map (lambda (name-version) + (apply lookup-node name-version)) + (remove (lambda (name-version) + (apply exists? name-version)) + (node-dependencies node)))) + (lambda (node) + (string-append + (node-name node) + (or (node-version node) "")))))) diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 874816442e..7c6c782917 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +65,33 @@ '()))) #:guix-name identity)) +(test-equal "recursive-import: skip false packages (toplevel)" + '() + (recursive-import "foo" + #:repo 'repo + #:repo->guix-package + (match-lambda* + (("foo" #:version #f #:repo 'repo) + (values #f '()))) + #:guix-name identity)) + +(test-equal "recursive-import: skip false packages (dependency)" + '((package + (name "foo") + (inputs `(("bar" ,bar))))) + (recursive-import "foo" + #:repo 'repo + #:repo->guix-package + (match-lambda* + (("foo" #:version #f #:repo 'repo) + (values '(package + (name "foo") + (inputs `(("bar" ,bar)))) + '("bar"))) + (("bar" #:version #f #:repo 'repo) + (values #f '()))) + #:guix-name identity)) + (test-assert "alist->package with simple source" (let* ((meta '(("name" . "hello") ("version" . "2.10") From patchwork Mon Jun 28 16:20:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 30763 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 19F4627BC81; Mon, 28 Jun 2021 17:23:54 +0100 (BST) 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,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 8CD0227BC78 for ; Mon, 28 Jun 2021 17:23:53 +0100 (BST) Received: from localhost ([::1]:54684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxu36-0002QM-KU for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 12:23:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxu0O-0004nU-Ua for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxu0N-0000UO-Me for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxu0N-0005Ws-JT for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49196] [PATCH v4 3/3] import: go: Improve error handling. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 16:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49196@debbugs.gnu.org Cc: iskarian@mgsn.dev, zimoun Received: via spool by 49196-submit@debbugs.gnu.org id=B49196.162489724821186 (code B ref 49196); Mon, 28 Jun 2021 16:21:03 +0000 Received: (at 49196) by debbugs.gnu.org; 28 Jun 2021 16:20:48 +0000 Received: from localhost ([127.0.0.1]:52333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxu06-0005Va-5Q for submit@debbugs.gnu.org; Mon, 28 Jun 2021 12:20:47 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:41861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtzq-0005UW-1l for 49196@debbugs.gnu.org; Mon, 28 Jun 2021 12:20:45 -0400 Received: by mail-wr1-f49.google.com with SMTP id u8so8683847wrq.8 for <49196@debbugs.gnu.org>; Mon, 28 Jun 2021 09:20:30 -0700 (PDT) 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=l/x0W3/XbvXoKmOKYcgxtiOksxk+Xm5/lB61rm36/pI=; b=LmRo6e6t2eSJVDdktPPfz16VcqydcYm8g4+IRRALgZRkKAPjRkMgte7zvBo8t9cDzN TWhHgMGC3zyErmmkPLFybwzfCwVQzIYlVoU3sFrtR4paqGMZisWP7mv/l0/ylPWZneBW cQo8YrRv0QOkDrnQzKBPIfm6p2M3mz1QNsuCpQpsrcX6SoADqC5b1wkBpP8txrYJzHVW M5FpC+XDrSQ35ne6n3/EIID6B0kvz21u+v9DUsWhcj/en3gpAgNLB/EcrVCHeVpC4KTR YOtxJRfIM1npKM75ZEJgvyQoFiUbBXR6Kp9IVn8rGjynsaSwcd0cqzrInngE9B7HQYvC Wg1A== 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=l/x0W3/XbvXoKmOKYcgxtiOksxk+Xm5/lB61rm36/pI=; b=knUtJtT6U+xnr8BpDaQWgsxj0Se/uBkoHj0kmnoRZGaDQX7jA1C9BAXPCRrxmsD4Ur bUB2+1oZB2r1hJ9vjCedEDu9xjKqtdHEUXSctOkPznqqJFmXfLK8kspJkdturx0VOZDN 0Eyb8Jrlf064SFJuawXnPToz3Cl+j7m5gWnLSWz1RN6XsW3ApcCLfeJNITJNfh/qJQJ0 ZDxDIBbX1P797HHUY+z/cOBsdO5BAQbSOVm+Tx4pDTAkVNktYY5KyTpnt03Dhs23uxOd H7zwC81AGFNJpAdNKWfbiRtPBor/zoacUdT4JT/yvHG1z5oh4k7oLl2xEuSq+QWrCWpw Ox2w== X-Gm-Message-State: AOAM530lJLEbv0D1jUA/bcLy/uCLtgXkjXH/04MTqli0Us7xckMiuvPx /E3wrtYNN+wT0z0AYqSeJCgLYIz8NpM= X-Google-Smtp-Source: ABdhPJz6cI9aA9S/z303Uq1vln1W+FEsOWPkm0u/WW6MjDBZTuTSbmg2Bm3tWdYQKrZJCvFMRNZVKg== X-Received: by 2002:a05:6000:1251:: with SMTP id j17mr28543979wrx.122.1624897224606; Mon, 28 Jun 2021 09:20:24 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id v18sm17050567wrv.24.2021.06.28.09.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:20:24 -0700 (PDT) From: zimoun Date: Mon, 28 Jun 2021 18:20:14 +0200 Message-Id: <20210628162014.15319-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210628162014.15319-1-zimon.toutoune@gmail.com> References: <20210628162014.15319-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 * guix/import/go.scm (go-module->guix-package*): Handle errors. (go-module-recursive-import): Remove 'guard'. * guix/scripts/import/go.scm (guix-import-go): Adjust. * tests/go.scm: Adjust. --- guix/import/go.scm | 49 +++++++++++++++++++++++--------------- guix/scripts/import/go.scm | 6 ++--- tests/go.scm | 2 +- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index a2863c79ad..e7d8bc3959 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -5,7 +5,8 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Xinglu Chen -;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,7 @@ #:use-module (web uri) #:export (go-module->guix-package + go-module->guix-package* go-module-recursive-import)) ;;; Commentary: @@ -631,7 +633,28 @@ hint: use one of the following available versions ~a\n" dependencies+versions dependencies)))) -(define go-module->guix-package* (memoize go-module->guix-package)) +(define go-module->guix-package* + (lambda args + ;; Disable output buffering so that the following warning gets printed + ;; consistently. + (setvbuf (current-error-port) 'none) + (let ((package-name (match args ((name _ ...) name)))) + (guard (c ((http-get-error? c) + (warning (G_ "Failed to import package ~s. +reason: ~s could not be fetched: HTTP error ~a (~s). +This package and its dependencies won't be imported.~%") + package-name + (uri->string (http-get-error-uri c)) + (http-get-error-code c) + (http-get-error-reason c)) + (values #f '())) + (else + (warning (G_ "Failed to import package ~s. +reason: ~s.~%") + package-name + (exception-args c)) + (values #f '()))) + (apply go-module->guix-package args))))) (define* (go-module-recursive-import package-name #:key (goproxy "https://proxy.golang.org") @@ -642,22 +665,10 @@ hint: use one of the following available versions ~a\n" package-name #:repo->guix-package (lambda* (name #:key version repo) - ;; Disable output buffering so that the following warning gets printed - ;; consistently. - (setvbuf (current-error-port) 'none) - (guard (c ((http-get-error? c) - (warning (G_ "Failed to import package ~s. -reason: ~s could not be fetched: HTTP error ~a (~s). -This package and its dependencies won't be imported.~%") - name - (uri->string (http-get-error-uri c)) - (http-get-error-code c) - (http-get-error-reason c)) - (values #f '()))) - (receive (package-sexp dependencies) - (go-module->guix-package* name #:goproxy goproxy - #:version version - #:pin-versions? pin-versions?) - (values package-sexp dependencies)))) + (receive (package-sexp dependencies) + (go-module->guix-package* name #:goproxy goproxy + #:version version + #:pin-versions? pin-versions?) + (values package-sexp dependencies))) #:guix-name go-module->guix-package-name #:version version)) diff --git a/guix/scripts/import/go.scm b/guix/scripts/import/go.scm index 74e8e60cce..071ecdb2ef 100644 --- a/guix/scripts/import/go.scm +++ b/guix/scripts/import/go.scm @@ -115,10 +115,10 @@ that are not yet in Guix")) (map package->definition* (apply go-module-recursive-import arguments)) ;; Single import. - (let ((sexp (apply go-module->guix-package arguments))) + (let ((sexp (apply go-module->guix-package* arguments))) (unless sexp - (leave (G_ "failed to download meta-data for module '~a'~%") - module-name)) + (leave (G_ "failed to download meta-data for module '~a'.~%") + name)) (package->definition* sexp)))))) (() (leave (G_ "too few arguments~%"))) diff --git a/tests/go.scm b/tests/go.scm index b088ab50d2..929a8b39d1 100644 --- a/tests/go.scm +++ b/tests/go.scm @@ -286,6 +286,6 @@ package.") (nix-base32-string->bytevector "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5") #f))) - (go-module->guix-package "github.com/go-check/check"))))))) + (go-module->guix-package* "github.com/go-check/check"))))))) (test-end "go")