diff options
| author | Russ Cox <rsc@golang.org> | 2020-10-27 10:41:25 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2020-10-27 15:11:50 +0000 |
| commit | 69496a22682108bed606d4d509cfa3253f0cac3b (patch) | |
| tree | 321c404b9ba5536d209d6bf5b25b576cb1f11117 | |
| parent | 320cc79002b5ce5f8d7f667f0aa78a1fdce59eb4 (diff) | |
| download | go-69496a22682108bed606d4d509cfa3253f0cac3b.tar.gz go-69496a22682108bed606d4d509cfa3253f0cac3b.zip | |
cmd/go: fix bug introduced in CL 264537
Shadowing bug noted after submit by Tom Thorogood.
Change-Id: I5f40cc3863dcd7dba5469f8530e9d0460e7c3e7e
Reviewed-on: https://go-review.googlesource.com/c/go/+/265537
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
| -rw-r--r-- | src/cmd/go/internal/fsys/fsys.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/go/internal/fsys/fsys.go b/src/cmd/go/internal/fsys/fsys.go index 3275c3faf7..5a8b36e2bc 100644 --- a/src/cmd/go/internal/fsys/fsys.go +++ b/src/cmd/go/internal/fsys/fsys.go @@ -378,7 +378,8 @@ func IsDirWithGoFiles(dir string) (bool, error) { // But it's okay if the file is a symlink pointing to a regular // file, so use os.Stat to follow symlinks and check that. actualFilePath, _ := OverlayPath(filepath.Join(dir, fi.Name())) - if fi, err := os.Stat(actualFilePath); err == nil && fi.Mode().IsRegular() { + fi, err := os.Stat(actualFilePath) + if err == nil && fi.Mode().IsRegular() { return true, nil } if err != nil && firstErr == nil { |