|
1 From 1d11801f40a4c1d61e1766f239e8ea908222f072 Mon Sep 17 00:00:00 2001 |
|
2 From: Vincent Vanackere <[email protected]> |
|
3 Date: Wed, 26 Aug 2015 15:55:27 +0200 |
|
4 Subject: [PATCH 13/63] [release-branch.go1.5] cmd/go: properly ignore import |
|
5 comments for vendored packages rooted at GOPATH |
|
6 |
|
7 Fixes #12232. |
|
8 |
|
9 Change-Id: Ide3fb7f5fc5ae377ae8683fbb94fd0dc01480549 |
|
10 Reviewed-on: https://go-review.googlesource.com/13924 |
|
11 Reviewed-by: Russ Cox <[email protected]> |
|
12 Reviewed-on: https://go-review.googlesource.com/14228 |
|
13 Reviewed-by: Ian Lance Taylor <[email protected]> |
|
14 --- |
|
15 src/cmd/go/pkg.go | 3 ++- |
|
16 1 file changed, 2 insertions(+), 1 deletion(-) |
|
17 |
|
18 diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go |
|
19 index 61e3d8d..c481794 100644 |
|
20 --- a/src/cmd/go/pkg.go |
|
21 +++ b/src/cmd/go/pkg.go |
|
22 @@ -368,7 +368,8 @@ func loadImport(path, srcDir string, parent *Package, stk *importStack, importPo |
|
23 if gobin != "" { |
|
24 bp.BinDir = gobin |
|
25 } |
|
26 - if err == nil && !isLocal && bp.ImportComment != "" && bp.ImportComment != path && (!go15VendorExperiment || !strings.Contains(path, "/vendor/")) { |
|
27 + if err == nil && !isLocal && bp.ImportComment != "" && bp.ImportComment != path && |
|
28 + (!go15VendorExperiment || (!strings.Contains(path, "/vendor/") && !strings.HasPrefix(path, "vendor/"))) { |
|
29 err = fmt.Errorf("code in directory %s expects import %q", bp.Dir, bp.ImportComment) |
|
30 } |
|
31 p.load(stk, bp, err) |
|
32 -- |
|
33 2.6.1 |
|
34 |