diff options
| author | Vincent Vanackere <vincent.vanackere@gmail.com> | 2015-08-26 15:55:27 +0200 |
|---|---|---|
| committer | Chris Broadfoot <cbro@golang.org> | 2015-09-08 18:01:43 +0000 |
| commit | 1d11801f40a4c1d61e1766f239e8ea908222f072 (patch) | |
| tree | 7b6365d716459ffa45406b86b2b5d71dee72cb36 | |
| parent | 05078023963370af0faa9689373c3bd6c7d6dfe4 (diff) | |
| download | go-1d11801f40a4c1d61e1766f239e8ea908222f072.tar.gz go-1d11801f40a4c1d61e1766f239e8ea908222f072.zip | |
[release-branch.go1.5] 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>
Reviewed-on: https://go-review.googlesource.com/14228
Reviewed-by: Ian Lance Taylor <iant@golang.org>
| -rw-r--r-- | src/cmd/go/pkg.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go index 61e3d8dc70..c4817947a1 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) |