1
0
mirror of https://github.com/golang/go synced 2024-11-23 00:00:07 -07:00

cmd/go: print offending -mod value in workspace mode

Workspace mode only allows -mod to be set to 'readonly'. When returning
the error for other values of -mod, specify the the value in the error
so it's easier to see what's going on when the go command is invoked
through another tool.

For #45713, #48186

Change-Id: I3ba206a71c7a20c18aeccfa48f3c9dc935a180a4
Reviewed-on: https://go-review.googlesource.com/c/go/+/347593
Trust: Michael Matloob <matloob@golang.org>
Trust: Daniel Martí <mvdan@mvdan.cc>
Run-TryBot: Michael Matloob <matloob@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
Michael Matloob 2021-09-03 18:11:00 -04:00
parent 37c9552e06
commit 65f0d24f73

View File

@ -976,9 +976,9 @@ func requirementsFromModFiles(ctx context.Context, modFiles []*modfile.File) *Re
func setDefaultBuildMod() { func setDefaultBuildMod() {
if cfg.BuildModExplicit { if cfg.BuildModExplicit {
if inWorkspaceMode() && cfg.BuildMod != "readonly" { if inWorkspaceMode() && cfg.BuildMod != "readonly" {
base.Fatalf("go: -mod may only be set to readonly when in workspace mode." + base.Fatalf("go: -mod may only be set to readonly when in workspace mode, but it is set to %q"+
"\n\tRemove the -mod flag to use the default readonly value," + "\n\tRemove the -mod flag to use the default readonly value,"+
"\n\tor set -workfile=off to disable workspace mode.") "\n\tor set -workfile=off to disable workspace mode.", cfg.BuildMod)
} }
// Don't override an explicit '-mod=' argument. // Don't override an explicit '-mod=' argument.
return return