diff options
| author | Russ Cox <rsc@golang.org> | 2018-11-13 09:46:32 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2018-11-13 15:58:52 +0000 |
| commit | b075dfba8066033e35cd62aaacf3c8a2593cfa57 (patch) | |
| tree | 149642f7871416e7c767842c12a250dc65ae7aa6 /src | |
| parent | 43edf21eff83e95b32cc43453c3a8df816d85e88 (diff) | |
| download | go-b075dfba8066033e35cd62aaacf3c8a2593cfa57.tar.xz | |
cmd/go/internal/modload: skip go.mod directories on all systems, not just Plan 9
I see no reason Plan 9 should be special cased.
A directory named go.mod is not useful on any system.
Followup to CL 129804.
Change-Id: I9cc91b5934b17650bfdb07370aa73aeae445968c
Reviewed-on: https://go-review.googlesource.com/c/149337
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/go/internal/modload/init.go | 5 | ||||
| -rw-r--r-- | src/cmd/go/internal/modload/init_test.go (renamed from src/cmd/go/internal/modload/init_plan9_test.go) | 0 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go index da778b4fad..7e8c223189 100644 --- a/src/cmd/go/internal/modload/init.go +++ b/src/cmd/go/internal/modload/init.go @@ -25,7 +25,6 @@ import ( "path" "path/filepath" "regexp" - "runtime" "strconv" "strings" ) @@ -402,7 +401,7 @@ func FindModuleRoot(dir, limit string, legacyConfigOK bool) (root, file string) // Look for enclosing go.mod. for { - if fi, err := os.Stat(filepath.Join(dir, "go.mod")); err == nil && !(runtime.GOOS == "plan9" && fi.IsDir()) { + if fi, err := os.Stat(filepath.Join(dir, "go.mod")); err == nil && !fi.IsDir() { return dir, "go.mod" } if dir == limit { @@ -420,7 +419,7 @@ func FindModuleRoot(dir, limit string, legacyConfigOK bool) (root, file string) dir = dir1 for { for _, name := range altConfigs { - if fi, err := os.Stat(filepath.Join(dir, name)); err == nil && !(runtime.GOOS == "plan9" && fi.IsDir()) { + if fi, err := os.Stat(filepath.Join(dir, name)); err == nil && !fi.IsDir() { return dir, name } } diff --git a/src/cmd/go/internal/modload/init_plan9_test.go b/src/cmd/go/internal/modload/init_test.go index 2df9d8af7d..2df9d8af7d 100644 --- a/src/cmd/go/internal/modload/init_plan9_test.go +++ b/src/cmd/go/internal/modload/init_test.go |