aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2012-01-18 19:27:16 -0800
committerBrad Fitzpatrick <bradfitz@golang.org>2012-01-18 19:27:16 -0800
commitf47807a57f9dacab74ebf7e9d86f3dc0dcb933b0 (patch)
tree21e46c1d430fb1bf910f404396cf02cfa3eff973
parentb58b5ba997ad5ab5b6419a575cb5829a45097fa6 (diff)
downloadgo-f47807a57f9dacab74ebf7e9d86f3dc0dcb933b0.tar.gz
go-f47807a57f9dacab74ebf7e9d86f3dc0dcb933b0.zip
cmd/go: skip _obj directories in package scans
Fixes #2693 R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5557057
-rw-r--r--src/cmd/go/main.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index 8ef6395f4f..fdea80916f 100644
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -327,9 +327,9 @@ func allPackages(pattern string) []string {
return nil
}
- // Avoid .foo and testdata directory trees.
+ // Avoid .foo, _foo, and testdata directory trees.
_, elem := filepath.Split(path)
- if strings.HasPrefix(elem, ".") || elem == "testdata" {
+ if strings.HasPrefix(elem, ".") || strings.HasPrefix(elem, "_") || elem == "testdata" {
return filepath.SkipDir
}
@@ -394,9 +394,9 @@ func allPackagesInFS(pattern string) []string {
return nil
}
- // Avoid .foo and testdata directory trees.
+ // Avoid .foo, _foo, and testdata directory trees.
_, elem := filepath.Split(path)
- if strings.HasPrefix(elem, ".") || elem == "testdata" {
+ if strings.HasPrefix(elem, ".") || strings.HasPrefix(elem, "_") || elem == "testdata" {
return filepath.SkipDir
}