cmd/go: properly ignore import comments for vendored packages rooted at GOPATH

vanackere · rsc · commit b55c4a0c540f · 2015-08-27T15:30:30.000Z
Fixes #12232. Change-Id: Ide3fb7f5fc5ae377ae8683fbb94fd0dc01480549 Reviewed-on: https://go-review.googlesource.com/13924 Reviewed-by: Russ Cox <rsc@golang.org>
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
@@ -368,7 +368,8 @@ func loadImport(path, srcDir string, parent *Package, stk *importStack, importPo
 	if gobin != "" {
 		bp.BinDir = gobin
 	}
-	if err == nil && !isLocal && bp.ImportComment != "" && bp.ImportComment != path && (!go15VendorExperiment || !strings.Contains(path, "/vendor/")) {
+	if err == nil && !isLocal && bp.ImportComment != "" && bp.ImportComment != path &&
+		(!go15VendorExperiment || (!strings.Contains(path, "/vendor/") && !strings.HasPrefix(path, "vendor/"))) {
 		err = fmt.Errorf("code in directory %s expects import %q", bp.Dir, bp.ImportComment)
 	}
 	p.load(stk, bp, err)

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,8 @@ func loadImport(path, srcDir string, parent Package, stk importStack, importPo`
`368`	`368`	`if gobin != "" {`
`369`	`369`	`bp.BinDir = gobin`
`370`	`370`	`}`
`371`		`- if err == nil && !isLocal && bp.ImportComment != "" && bp.ImportComment != path && (!go15VendorExperiment \|\| !strings.Contains(path, "/vendor/")) {`
	`371`	`+ if err == nil && !isLocal && bp.ImportComment != "" && bp.ImportComment != path &&`
	`372`	`+ (!go15VendorExperiment \|\| (!strings.Contains(path, "/vendor/") && !strings.HasPrefix(path, "vendor/"))) {`
`372`	`373`	`err = fmt.Errorf("code in directory %s expects import %q", bp.Dir, bp.ImportComment)`
`373`	`374`	`}`
`374`	`375`	`p.load(stk, bp, err)`