diff options
| author | Jay Conrod <jayconrod@google.com> | 2020-09-11 13:30:43 -0400 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2020-09-15 12:46:25 +0000 |
| commit | 03875bd9bc112d25a4496f7ff22888f23a26baea (patch) | |
| tree | 6f9fc4493cb0b775dabd1affa30d6e4209b153c3 /src/cmd/go/internal/modcmd/verify.go | |
| parent | e3063636124d0e5b2d0fad7912a9c6810629f486 (diff) | |
| download | go-03875bd9bc112d25a4496f7ff22888f23a26baea.tar.gz go-03875bd9bc112d25a4496f7ff22888f23a26baea.zip | |
cmd/go: add modload.NeedRoot mode for commands that need module root
This makes error reporting a bit more consistent for 'go mod'
subcommands. Most of these commands only work in module mode when a
go.mod file is present.
Setting modload.ForceUseModules reports an error when GO111MODULE=off.
Setting modload.RootMode to modload.NeedRoot reports an error when no
go.mod file is present.
Change-Id: I1daa8d2971cb8658e0c804765839d903734a412e
Reviewed-on: https://go-review.googlesource.com/c/go/+/254369
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
Diffstat (limited to 'src/cmd/go/internal/modcmd/verify.go')
| -rw-r--r-- | src/cmd/go/internal/modcmd/verify.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/cmd/go/internal/modcmd/verify.go b/src/cmd/go/internal/modcmd/verify.go index 7700588bde..bd591d3f32 100644 --- a/src/cmd/go/internal/modcmd/verify.go +++ b/src/cmd/go/internal/modcmd/verify.go @@ -14,7 +14,6 @@ import ( "runtime" "cmd/go/internal/base" - "cmd/go/internal/cfg" "cmd/go/internal/modfetch" "cmd/go/internal/modload" @@ -45,14 +44,8 @@ func runVerify(ctx context.Context, cmd *base.Command, args []string) { // NOTE(rsc): Could take a module pattern. base.Fatalf("go mod verify: verify takes no arguments") } - // Checks go mod expected behavior - if !modload.Enabled() || !modload.HasModRoot() { - if cfg.Getenv("GO111MODULE") == "off" { - base.Fatalf("go: modules disabled by GO111MODULE=off; see 'go help modules'") - } else { - base.Fatalf("go: cannot find main module; see 'go help modules'") - } - } + modload.ForceUseModules = true + modload.RootMode = modload.NeedRoot // Only verify up to GOMAXPROCS zips at once. type token struct{} |