Commit 356f5a11 authored by Jay Conrod's avatar Jay Conrod

cmd/go: list directories in module cache replacements

"go list" has allowed listing directory paths to packages in the
module cache since CL 126715. This is sometimes necessary for tools
gathering package information about source files in imported packages.

With this change, we only allow directories in the module cache for
modules in the build list after replacements are applied. Previously,
we ignored replacements when expanding file system path patterns while
constructing the build list.

Fixes #29548

Change-Id: Ic7f89122c4656c8967c14545cb7117f98e89e721
Reviewed-on: https://go-review.googlesource.com/c/go/+/165381
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarBryan C. Mills <bcmills@google.com>
parent 37e4a61d
......@@ -212,7 +212,18 @@ func ImportPaths(patterns []string) []*search.Match {
// if dir is in the module cache copy of a module in our build list.
func pathInModuleCache(dir string) string {
for _, m := range buildList[1:] {
root, err := modfetch.DownloadDir(m)
var root string
var err error
if repl := Replacement(m); repl.Path != "" && repl.Version == "" {
root = repl.Path
if !filepath.IsAbs(root) {
root = filepath.Join(ModRoot(), root)
}
} else if repl.Path != "" {
root, err = modfetch.DownloadDir(repl)
} else {
root, err = modfetch.DownloadDir(m)
}
if err != nil {
continue
}
......
# Test that "go list" succeeds when given a directory in a replacement
# module within the module cache.
# Verifies golang.org/issue/29548
env GO111MODULE=on
go mod download
! go list $GOPATH/pkg/mod/rsc.io/quote@v1.5.2
stderr 'outside available modules'
go list $GOPATH/pkg/mod/rsc.io/quote@v1.5.1
stdout 'rsc.io/quote'
-- go.mod --
module example.com/quoter
require rsc.io/quote v1.5.2
replace rsc.io/quote => rsc.io/quote v1.5.1
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment