aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Matloob <matloob@golang.org>2021-09-03 18:11:00 -0400
committerMichael Matloob <matloob@golang.org>2021-09-08 18:48:02 +0000
commit65f0d24f73fa5386bf921393cbd26bb8f9cead03 (patch)
tree4edf14596f5813cdce41b06a826b6ea15715dd13 /src
parent37c9552e065fb4331d8cba84c12392806f1ecbbe (diff)
downloadgo-65f0d24f73fa5386bf921393cbd26bb8f9cead03.tar.xz
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>
Diffstat (limited to 'src')
-rw-r--r--src/cmd/go/internal/modload/init.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go
index a1016ec5a3..a855e6c851 100644
--- a/src/cmd/go/internal/modload/init.go
+++ b/src/cmd/go/internal/modload/init.go
@@ -976,9 +976,9 @@ func requirementsFromModFiles(ctx context.Context, modFiles []*modfile.File) *Re
func setDefaultBuildMod() {
if cfg.BuildModExplicit {
if inWorkspaceMode() && cfg.BuildMod != "readonly" {
- base.Fatalf("go: -mod may only be set to readonly when in workspace mode." +
- "\n\tRemove the -mod flag to use the default readonly value," +
- "\n\tor set -workfile=off to disable 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\tor set -workfile=off to disable workspace mode.", cfg.BuildMod)
}
// Don't override an explicit '-mod=' argument.
return