commit b55c4a0c540f164687bcceeb50d07397b5e098be
author Vincent Vanackere <vincent.vanackere@gmail.com> Wed Aug 26 15:55:27 2015 +0200
committer Russ Cox <rsc@golang.org> Thu Aug 27 15:30:30 2015 +0000
tree 1ae67405123880d751a572c1ac13e04003c54124
parent 34db31d5f5c64f8d232dc0f279ae7e7f621c2ad7

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

Fixes #12232.

Change-Id: Ide3fb7f5fc5ae377ae8683fbb94fd0dc01480549
Reviewed-on: https://go-review.googlesource.com/13924
Reviewed-by: Russ Cox <rsc@golang.org>

src/cmd/go/pkg.go

diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index 1171d20..adce182 100644
--- a/src/cmd/go/pkg.go
+++ b/src/cmd/go/pkg.go
@@ -368,7 +368,8 @@
 	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)