Skip to content

Commit 5587e05

Browse files
iwdgoJay Conrod
authored and
Jay Conrod
committed
cmd/go: fix error messages for go mod download in GOPATH mode
Checks if modules are enabled in GOPATH mode. Error message returned when no version is provided. Relevant tests updated. Test for GO111MODULE=off added. Fixes #27783 Change-Id: I12cdaced5fa38a9c49c0ecfed4c479eb86ed061f Reviewed-on: https://go-review.googlesource.com/c/go/+/179998 Run-TryBot: Jay Conrod <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Bryan C. Mills <[email protected]>
1 parent b23ff2c commit 5587e05

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

src/cmd/go/internal/modcmd/download.go

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package modcmd
66

77
import (
8+
"cmd/go/internal/cfg"
89
"encoding/json"
910
"os"
1011

@@ -67,6 +68,13 @@ type moduleJSON struct {
6768
}
6869

6970
func runDownload(cmd *base.Command, args []string) {
71+
// Check whether modules are enabled and whether we're in a module.
72+
if cfg.Getenv("GO111MODULE") == "off" {
73+
base.Fatalf("go: modules disabled by GO111MODULE=off; see 'go help modules'")
74+
}
75+
if !modload.HasModRoot() && len(args) == 0 {
76+
base.Fatalf("go mod download: no modules specified (see 'go help mod download')")
77+
}
7078
if len(args) == 0 {
7179
args = []string{"all"}
7280
}

src/cmd/go/testdata/script/mod_off.txt

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ stderr 'go mod init: modules disabled by GO111MODULE=off; see ''go help modules'
99
stderr 'go: modules disabled by GO111MODULE=off; see ''go help modules'''
1010
! go mod verify
1111
stderr 'go: modules disabled by GO111MODULE=off; see ''go help modules'''
12+
! go mod download
13+
stderr 'go: modules disabled by GO111MODULE=off; see ''go help modules'''
1214

1315
# Same result in an empty directory
1416
mkdir z
@@ -19,6 +21,8 @@ stderr 'go mod init: modules disabled by GO111MODULE=off; see ''go help modules'
1921
stderr 'go: modules disabled by GO111MODULE=off; see ''go help modules'''
2022
! go mod verify
2123
stderr 'go: modules disabled by GO111MODULE=off; see ''go help modules'''
24+
! go mod download
25+
stderr 'go: modules disabled by GO111MODULE=off; see ''go help modules'''
2226

2327
-- sample.go --
2428
package sample

0 commit comments

Comments
 (0)