diff options
| author | Jay Conrod <jayconrod@google.com> | 2019-12-19 13:00:28 -0500 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2019-12-19 19:52:21 +0000 |
| commit | 0f834bb77e11d1ca1f06fc925f5bd7e44c7f4867 (patch) | |
| tree | ac6d40a65679207c9d6827cb509ecbcbf387c42f /src/cmd/go/internal/modload/build.go | |
| parent | a197c7bbf2bee9c7078e821736e81f9642548443 (diff) | |
| download | go-0f834bb77e11d1ca1f06fc925f5bd7e44c7f4867.tar.gz go-0f834bb77e11d1ca1f06fc925f5bd7e44c7f4867.zip | |
cmd/go: in 'go list -m', print effective go.mod file
When the -modfile flag is in use (either explicitly or from GOFLAGS),
'go list -m' will now print the effective go.mod file for the main
module in the GoMod field in -f or -json output.
Fixes #36220
Updates #34506
Change-Id: I89c2ee40f20e07854bb37c6e4e13eeea0cce7b0d
Reviewed-on: https://go-review.googlesource.com/c/go/+/212100
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modload/build.go')
| -rw-r--r-- | src/cmd/go/internal/modload/build.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/internal/modload/build.go b/src/cmd/go/internal/modload/build.go index 5a281a9304..6fa47d7400 100644 --- a/src/cmd/go/internal/modload/build.go +++ b/src/cmd/go/internal/modload/build.go @@ -112,7 +112,7 @@ func moduleInfo(m module.Version, fromBuildList bool) *modinfo.ModulePublic { } if HasModRoot() { info.Dir = ModRoot() - info.GoMod = filepath.Join(info.Dir, "go.mod") + info.GoMod = ModFilePath() if modFile.Go != nil { info.GoVersion = modFile.Go.Version } |