From e48e8d29fb505b9b12613d225185ab53407d542f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Mon, 27 May 2019 15:12:53 +0200 Subject: [PATCH 02/16] cmd/go: disable Google's proxy and sumdb --- src/cmd/go/internal/cfg/cfg.go | 10 +++++----- src/cmd/go/testdata/script/mod_sumdb_golang.txt | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go index c48904eacc..66ef0339d0 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go @@ -261,11 +261,11 @@ var ( GOPPC64 = envOr("GOPPC64", fmt.Sprintf("%s%d", "power", objabi.GOPPC64)) GOWASM = envOr("GOWASM", fmt.Sprint(objabi.GOWASM)) - GOPROXY = envOr("GOPROXY", "https://proxy.golang.org,direct") - GOSUMDB = envOr("GOSUMDB", "sum.golang.org") - GOPRIVATE = Getenv("GOPRIVATE") - GONOPROXY = envOr("GONOPROXY", GOPRIVATE) - GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) + GOPROXY = envOr("GOPROXY", "direct") + GOSUMDB = envOr("GOSUMDB", "off") + GOPRIVATE = Getenv("GOPRIVATE") + GONOPROXY = envOr("GONOPROXY", GOPRIVATE) + GONOSUMDB = envOr("GONOSUMDB", GOPRIVATE) GOINSECURE = Getenv("GOINSECURE") GOVCS = Getenv("GOVCS") ) diff --git a/src/cmd/go/testdata/script/mod_sumdb_golang.txt b/src/cmd/go/testdata/script/mod_sumdb_golang.txt index cc0b0da474..b50689e209 100644 --- a/src/cmd/go/testdata/script/mod_sumdb_golang.txt +++ b/src/cmd/go/testdata/script/mod_sumdb_golang.txt @@ -2,12 +2,12 @@ env GOPROXY= env GOSUMDB= go env GOPROXY -stdout '^https://proxy.golang.org,direct$' +stdout '^direct$' go env GOSUMDB -stdout '^sum.golang.org$' +stdout '^off$' env GOPROXY=https://proxy.golang.org go env GOSUMDB -stdout '^sum.golang.org$' +stdout '^off$' # Download direct from github. [!net] skip -- 2.38.1