From patchwork Fri Jun 25 16:37:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 30713 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 2C02A27BC81; Fri, 25 Jun 2021 17:40:06 +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 E1DB427BC78 for ; Fri, 25 Jun 2021 17:40:05 +0100 (BST) Received: from localhost ([::1]:45652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwos8-0007Sk-SJ for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 12:40:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lworA-00066n-DN for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwor9-0007UN-2L for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwor9-0001Kq-1N for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49196] [PATCH v3 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: Fri, 25 Jun 2021 16:39: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.16246390935042 (code B ref 49196); Fri, 25 Jun 2021 16:39:02 +0000 Received: (at 49196) by debbugs.gnu.org; 25 Jun 2021 16:38:13 +0000 Received: from localhost ([127.0.0.1]:46698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwoqK-0001JA-VD for submit@debbugs.gnu.org; Fri, 25 Jun 2021 12:38:13 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:40622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwoqE-0001I1-7B for 49196@debbugs.gnu.org; Fri, 25 Jun 2021 12:38:08 -0400 Received: by mail-wm1-f45.google.com with SMTP id o33-20020a05600c5121b02901e360c98c08so7104035wms.5 for <49196@debbugs.gnu.org>; Fri, 25 Jun 2021 09:38:06 -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=XxiTGtRPeTke2y/VJ6teh0xYTNnIwzmo2KerftKyvvw=; b=lWzBzphHecAAcRCX+LUUigDsxZsboC+1weC1aQutUajxSKTcmlEY8L1oxERVkH6Izt 3Lsgs5FazGSWz8tKLJG26Y61usyyD8VIXLBtsztwJ+VHwAjvPlvPlUQYhdQqRG+XlK78 K599MAJzTnDAwAfEytd9t3+NeMFf4X2lVBZBsgT4ogmm1PGo/FGRaT9qVyWtzH6DHmOK 9Lsc7bzcPblsBgFDTg1JJFOlJ/ragB9MeKfm2689RQQd289HoPrX10BbAVI2eUqRilJG 7KI2+IEu42af0VlcojkUqHHhyDXWk8qDY7EgnKGwiTM6+OIFs5gKiBhc9P7kGKRRANqt 9/Pg== 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=XxiTGtRPeTke2y/VJ6teh0xYTNnIwzmo2KerftKyvvw=; b=OTs+jZgRnTR6kHajEzPJLKL/nuV3qQzTZ0UxlWsn1a3p9+e7dRT0NsdxXFbR0KxR+2 hh6WJaI04nH7ylatSdNld1RO73rzbLNhO/eTN9VHsFVnORmd3fOon76saQXzRx33dj9H JaUYorsfra3hytc+EkjDIb2xOb2DfCJqrX+JMFASbAkw4s2m1bq1q9Lnm4OtdEi4tEe5 osJBfJexBM/IY213z5eaHip93WiVANcnAtw6DTrS3wp2aYs1sQjBIRp8KZY8ISoSEBW9 Bv4PvhYQ0TxzsQPU+2kMoZppF+yhPazUmCcHtMlKsq20iUuMlIQ7Z1qkQyAuaqojWECb WJ7Q== X-Gm-Message-State: AOAM531rKVbnN4dYDRJv0QN+GoAkKUvdx0Z9tj5Vdi8wRgNveDFmW6wn AojeXE9+MNFLhijpmAu+IyYd4+pAhAU= X-Google-Smtp-Source: ABdhPJyQ/7aX/qU3KlNC1Z+L6ySaCo1zxoJr4+vYG1wGOuC70XiMWkMG69W63cS0IB6021VUnqSyGw== X-Received: by 2002:a7b:c8c1:: with SMTP id f1mr11651962wml.90.1624639080316; Fri, 25 Jun 2021 09:38:00 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 2sm11642170wmk.24.2021.06.25.09.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 09:37:59 -0700 (PDT) From: zimoun Date: Fri, 25 Jun 2021 18:37:47 +0200 Message-Id: <20210625163749.65196-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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: 88c7c739740b56cab132cf1a3f16392c434408f7 diff --git a/guix/import/go.scm b/guix/import/go.scm index d110954664..c859098492 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -651,7 +652,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 Fri Jun 25 16:37:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 30711 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 ACA1427BC83; Fri, 25 Jun 2021 17:39:19 +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 180F627BC78 for ; Fri, 25 Jun 2021 17:39:19 +0100 (BST) Received: from localhost ([::1]:43690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lworO-00067j-2s for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 12:39:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lworA-00066i-0o for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwor8-0007UJ-9s for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwor8-0001Kc-7K for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49196] [PATCH v3 2/3] import: utils: Skip not found packages. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 16:39: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.16246390895020 (code B ref 49196); Fri, 25 Jun 2021 16:39:02 +0000 Received: (at 49196) by debbugs.gnu.org; 25 Jun 2021 16:38:09 +0000 Received: from localhost ([127.0.0.1]:46694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwoqG-0001It-Um for submit@debbugs.gnu.org; Fri, 25 Jun 2021 12:38:09 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:34616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwoqE-0001I3-Dh for 49196@debbugs.gnu.org; Fri, 25 Jun 2021 12:38:07 -0400 Received: by mail-wm1-f49.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso6703651wmc.1 for <49196@debbugs.gnu.org>; Fri, 25 Jun 2021 09:38:06 -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=Rjf3HBatfg67aqeE6yJDHorQVPkXdusIozmloghMJeLmr/e1uptvjvpo27ZsQWqtj6 RjMVAIEZJA1Up1foYNztqBxpUlXxrhbBnmYBedZzQU9fNxTmhqMJAaZcwEEuYCVXWOXK Jf4ZX8NdM+yWZkwWQUpS/eaS4fmFS+JfnDOi9bJaVFC8Khyd3hDR8xuinsU3Ek3V4T9u kcgpBr1/lWJOIAcSzkZ6YvdkY2JV2RRdXg8NbNJPtLNY1V77Jhl2N/7yY36BVDlBI5++ HThowZgUc9kYkPdEooxkLxuCBa+GzrAjSsz2EoIWKHBzQFtpteurCEPYW+l4rdn+e+1K /0BA== 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=uf3NQa0gbYKPqn6hb+l/ycd8JliPgb7aObnjNFrZ9jBUkwVM7w08+CPpH9J5EWFa6R xVBrv2mM4UZy1V7rBDsTX3I+QA2is9VaTC/VkA3FM/0wro3TwVldos19UgC0wyabc4/y T7nOP3dTNCaa3cCM7xAKkdOBcVLdvaIeeGTZyGzV26O/OTE1ccnnIzZt85vjz6fc4eA6 8EzfYBKHMf0Unf5gBZf5wEaPYL2g/Q8NUviB//PWoLWOUTncxi+gNZ7y0A8LKmP5SG9k YQslHh5LfqBJXWUSlm/a5nimLbR3C05hUlbxbtSlg4hNggHj03qILVFTmRWN4Kn3N3+W B37A== X-Gm-Message-State: AOAM532/FwHBhdaXGVQBAHTacryoWbNvag+l4tU3hR2AjZka7j9v2cKQ AMT6czAElti9igW1ITGyCBxF+iDTJIY= X-Google-Smtp-Source: ABdhPJz5wSw43PANWqV8eQ4eZ0A47XTTYUbTjXth+kL0EaU9DgPZhoxbO3QhtbY9ds3221IDbpZMvg== X-Received: by 2002:a7b:c052:: with SMTP id u18mr11808733wmc.105.1624639080843; Fri, 25 Jun 2021 09:38:00 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 2sm11642170wmk.24.2021.06.25.09.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 09:38:00 -0700 (PDT) From: zimoun Date: Fri, 25 Jun 2021 18:37:48 +0200 Message-Id: <20210625163749.65196-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210625163749.65196-1-zimon.toutoune@gmail.com> References: <20210625163749.65196-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 Fri Jun 25 16:37:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 30712 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 10FB127BC78; Fri, 25 Jun 2021 17:39:20 +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 33A7A27BC81 for ; Fri, 25 Jun 2021 17:39:19 +0100 (BST) Received: from localhost ([::1]:43698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lworO-00067q-81 for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 12:39:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lworA-00066j-6z for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwor8-0007UM-Ny for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwor8-0001Kj-K8 for guix-patches@gnu.org; Fri, 25 Jun 2021 12:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49196] [PATCH v3 3/3] import: go: Improve error handling. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 16:39: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, zimoun Received: via spool by 49196-submit@debbugs.gnu.org id=B49196.16246390935035 (code B ref 49196); Fri, 25 Jun 2021 16:39:02 +0000 Received: (at 49196) by debbugs.gnu.org; 25 Jun 2021 16:38:13 +0000 Received: from localhost ([127.0.0.1]:46696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwoqK-0001J6-E9 for submit@debbugs.gnu.org; Fri, 25 Jun 2021 12:38:12 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:34577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwoqF-0001I9-46 for 49196@debbugs.gnu.org; Fri, 25 Jun 2021 12:38:08 -0400 Received: by mail-wr1-f47.google.com with SMTP id e22so11269317wrc.1 for <49196@debbugs.gnu.org>; Fri, 25 Jun 2021 09:38:07 -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=i1UQbryFVBMTxsNb3xibfTlsptO7S3Oy039jdx7j4nw=; b=IuaLey39yLNp04yAI132qRrUdOfzXpdHNfBKgpNcgYm5iqGLIVDxr9eUEXMi8IbIo+ 2ofzLXWpW+MaTx0dtfWdD01lf4dG0MZIWxlH8TFcVzXuJQVkAsN9i6Yf1ZoiNNsehLDt R+9FUE2iUsnOESw58iyX8caV3lms/LH1FOrNWdPmAG0eb+QZWfpzcbSRG1Fpnwkwgv0S TZnDZsX+M3UnGoBbwLpIJvhl5Yn/5/MSk3HAB6diSBGAW+LwTUul4lEfSO80g2wNpLGq PLR3jHqQ+ovMvEeWBhEb+0rN0/U/J9ZSSv/cKwbJQxUV2/Wm8Cgz1xYCBl1Ws3f7aa9V 0YlA== 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=i1UQbryFVBMTxsNb3xibfTlsptO7S3Oy039jdx7j4nw=; b=pcA1mkZycVNu2vV8I4vRGqt2ViP2Pp8+YWeSukTbZt8fzxrF69dhk6cf2/tY+A39Mt WqkzhcQqqNj+qvMxP008oE40DzfzkjLOLPEnAHduN9Os8cs50KXLOAMHK+t03+b+/BlW 8+EZRWKpRjGsuq1B5wLvpx9U8TKYxSKLPSI9nt27MrSQua73ysNAcMoHxf/fsFRK0386 /YYJFXtxeKb8u+exskzzgtn9HS960Eb+f6oOTCGN8rI7C3FiIWkqODK9Nmf3Bk/hNcq6 deJCEUZQpPSBX5iLd6p0RHI5dCLeXL542A9c10qnNIKf2oa/U2eCPbEeA7auKuhEgeo9 b7ew== X-Gm-Message-State: AOAM5328SEqsPq4oETIphdluW+n0czacVBVd6KEEVOvZ4tGafQzTGLJm xe2GzJqObTQ+mWXzDCQ2CcpEJWSpPSM= X-Google-Smtp-Source: ABdhPJw/qWKGdnl/NqK/r2AIwCfZ1Tl+sSUvmA+UKwZhirrhIVtRfsid4s8XTs8gRhu406aYDUwsiQ== X-Received: by 2002:adf:9bd0:: with SMTP id e16mr12101162wrc.392.1624639081291; Fri, 25 Jun 2021 09:38:01 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id 2sm11642170wmk.24.2021.06.25.09.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 09:38:01 -0700 (PDT) From: zimoun Date: Fri, 25 Jun 2021 18:37:49 +0200 Message-Id: <20210625163749.65196-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210625163749.65196-1-zimon.toutoune@gmail.com> References: <20210625163749.65196-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 | 43 ++++++++++++++++++++++---------------- guix/scripts/import/go.scm | 6 +++--- tests/go.scm | 2 +- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/guix/import/go.scm b/guix/import/go.scm index c859098492..c559f02e5b 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,7 +62,7 @@ #:use-module (web response) #:use-module (web uri) - #:export (go-module->guix-package + #:export (go-module->guix-package* go-module-recursive-import)) ;;; Commentary: @@ -630,17 +631,9 @@ 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-recursive-import package-name - #:key (goproxy "https://proxy.golang.org") - version - pin-versions?) - - (recursive-import - package-name - #:repo->guix-package - (lambda* (name #:key version repo) +(define go-module->guix-package* + (memoize + (lambda args ;; Disable output buffering so that the following warning gets printed ;; consistently. (setvbuf (current-error-port) 'none) @@ -648,15 +641,29 @@ hint: use one of the following available versions ~a\n" (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 + (match args ((name _ ...) name)) (uri->string (http-get-error-uri c)) (http-get-error-code c) (http-get-error-reason c)) + (values #f '())) + (else + (warning (G_ "Something went wrong with ~s.~%") args) (values #f '()))) - (receive (package-sexp dependencies) - (go-module->guix-package* name #:goproxy goproxy - #:version version - #:pin-versions? pin-versions?) - (values package-sexp dependencies)))) + (apply go-module->guix-package args))))) + +(define* (go-module-recursive-import package-name + #:key (goproxy "https://proxy.golang.org") + version + pin-versions?) + + (recursive-import + package-name + #:repo->guix-package + (lambda* (name #:key version repo) + (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")