diff options
author | Michael Matloob <matloob@golang.org> | 2022-06-07 13:54:53 -0400 |
---|---|---|
committer | Michael Matloob <matloob@golang.org> | 2022-06-08 16:27:53 +0000 |
commit | f862280e30300017292b24a0fca088628d7b8065 (patch) | |
tree | 65294d0bfdc7a5a808ce3ba322ff380545cbf0d4 | |
parent | d65166024f3969289be5c74fd8be7d06a93264f1 (diff) | |
download | go-f862280e30300017292b24a0fca088628d7b8065.tar.gz go-f862280e30300017292b24a0fca088628d7b8065.zip |
cmd/go: properly call PackageModuleRoot to get modroot for index
PackageModuleRoot needs to be called with the package's path, not
its directory on disk.
Change-Id: I080fe8ce2aeb72e1466624db81595a00915606bb
Reviewed-on: https://go-review.googlesource.com/c/go/+/410820
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Michael Matloob <matloob@golang.org>
-rw-r--r-- | src/cmd/go/internal/load/pkg.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go index 4c7833b4d2..394a4a4383 100644 --- a/src/cmd/go/internal/load/pkg.go +++ b/src/cmd/go/internal/load/pkg.go @@ -871,7 +871,7 @@ func loadPackageData(ctx context.Context, path, parentPath, parentDir, parentRoo if !cfg.ModulesEnabled { buildMode = build.ImportComment } - if modroot := modload.PackageModRoot(ctx, r.dir); modroot != "" { + if modroot := modload.PackageModRoot(ctx, r.path); modroot != "" { if mi, err := modindex.Get(modroot); err == nil { data.p, data.err = mi.Import(cfg.BuildContext, mi.RelPath(r.dir), buildMode) goto Happy |