diff options
| author | Bryan C. Mills <bcmills@google.com> | 2020-10-28 23:49:54 -0400 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2020-10-30 18:05:53 +0000 |
| commit | 36d412f7548d90f4764c780a6f7d7da04bb90a9e (patch) | |
| tree | 40220d24292be83fc48226b51ecd1b96d2bbedde /src/cmd/go/internal/modload/load.go | |
| parent | 34665c63ff39b83dcc5d3ca6400c19ee737ac988 (diff) | |
| download | go-36d412f7548d90f4764c780a6f7d7da04bb90a9e.tar.gz go-36d412f7548d90f4764c780a6f7d7da04bb90a9e.zip | |
cmd/go/internal/modload: ensure that modRoot and targetPrefix are initialized in DirImportPath
For #37438
Change-Id: I2e1f47d567842ac5504b7b8ed0b3fba6f92d778b
Reviewed-on: https://go-review.googlesource.com/c/go/+/266340
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/modload/load.go')
| -rw-r--r-- | src/cmd/go/internal/modload/load.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go index f9c468c8b2..0a84a1765a 100644 --- a/src/cmd/go/internal/modload/load.go +++ b/src/cmd/go/internal/modload/load.go @@ -520,9 +520,10 @@ func ImportFromFiles(ctx context.Context, gofiles []string) { // DirImportPath returns the effective import path for dir, // provided it is within the main module, or else returns ".". func DirImportPath(dir string) string { - if modRoot == "" { + if !HasModRoot() { return "." } + LoadModFile(context.TODO()) if !filepath.IsAbs(dir) { dir = filepath.Join(base.Cwd, dir) |