diff options
Diffstat (limited to 'libgo/go/cmd/go/internal/modload/search.go')
| -rw-r--r-- | libgo/go/cmd/go/internal/modload/search.go | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/libgo/go/cmd/go/internal/modload/search.go b/libgo/go/cmd/go/internal/modload/search.go index d82386eca30..a303f51858a 100644 --- a/libgo/go/cmd/go/internal/modload/search.go +++ b/libgo/go/cmd/go/internal/modload/search.go @@ -13,8 +13,9 @@ import ( "cmd/go/internal/base" "cmd/go/internal/cfg" "cmd/go/internal/imports" - "cmd/go/internal/module" "cmd/go/internal/search" + + "golang.org/x/mod/module" ) // matchPackages returns a list of packages in the list of modules @@ -48,16 +49,20 @@ func matchPackages(pattern string, tags map[string]bool, useStd bool, modules [] return nil } - // Don't use GOROOT/src but do walk down into it. - if path == root && importPathRoot == "" { - return nil - } - want := true - // Avoid .foo, _foo, and testdata directory trees. - _, elem := filepath.Split(path) - if strings.HasPrefix(elem, ".") || strings.HasPrefix(elem, "_") || elem == "testdata" { - want = false + elem := "" + + // Don't use GOROOT/src but do walk down into it. + if path == root { + if importPathRoot == "" { + return nil + } + } else { + // Avoid .foo, _foo, and testdata subdirectory trees. + _, elem = filepath.Split(path) + if strings.HasPrefix(elem, ".") || strings.HasPrefix(elem, "_") || elem == "testdata" { + want = false + } } name := importPathRoot + filepath.ToSlash(path[len(root):]) |