From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 440C81382C5 for ; Wed, 26 May 2021 00:42:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21085E05C1; Wed, 26 May 2021 00:42:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E205FE03EC for ; Wed, 26 May 2021 00:42:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04D11335C7A for ; Wed, 26 May 2021 00:42:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41429632 for ; Wed, 26 May 2021 00:42:06 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1621989691.28fd92fe913eea196eab39b188b0788463c924d0.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/go-module.eclass X-VCS-Directories: eclass/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 28fd92fe913eea196eab39b188b0788463c924d0 X-VCS-Branch: master Date: Wed, 26 May 2021 00:42:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 487755e5-9ab1-41f9-9940-a1075c8fa455 X-Archives-Hash: d300bc2d4a25b24014f959ea83598f9e commit: 28fd92fe913eea196eab39b188b0788463c924d0 Author: William Hubbs gentoo org> AuthorDate: Wed May 26 00:41:31 2021 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed May 26 00:41:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28fd92fe go-module.eclass: fix GOPROXY export This variable should be exported in the go-module_set_globals function since it is not needed unless EGO_SUM is used. Signed-off-by: William Hubbs gentoo.org> eclass/go-module.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass index c9a7ab12eaf..9d64ad48b43 100644 --- a/eclass/go-module.eclass +++ b/eclass/go-module.eclass @@ -232,6 +232,9 @@ go-module_set_globals() { readonly EGO_SUM_SRC_URI readonly _GOMODULE_GOSUM_REVERSE_MAP + # export the GOPROXY setting + export GOPROXY="file://${T}/go-proxy" + # Set the guard that we are safe _GO_MODULE_SET_GLOBALS_CALLED=1 } @@ -268,7 +271,7 @@ _go-module_src_unpack_gosum() { die "go-module_set_globals must be called in global scope" fi - local goproxy_dir="${T}/go-proxy" + local goproxy_dir="${GOPROXY/file:\/\//}" mkdir -p "${goproxy_dir}" || die # For each Golang module distfile, look up where it's supposed to go, and @@ -293,7 +296,6 @@ _go-module_src_unpack_gosum() { unpack "$f" fi done - export GOPROXY="file://${goproxy_dir}" # Validate the gosum now _go-module_src_unpack_verify_gosum