From: Vincent Vanackere <vincent.vanackere@gmail.com>
Date: Wed, 26 Aug 2015 13:55:27 +0000 (+0200)
Subject: cmd/go: properly ignore import comments for vendored packages rooted at GOPATH
X-Git-Tag: go1.6beta1~1255
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b55c4a0c540f164687bcceeb50d07397b5e098be;p=gostls13.git

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>
---

diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index 1171d207b9..adce1820ef 100644
--- 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)