[release-branch.go1.5] cmd/go: properly ignore import comments for vendored packages...

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>

diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
index 61e3d8dc702ca06f31e778b900c344fb7f18fa7f..c4817947a17fef1cae1f3a2db25143394e7b83a1 100644 (file)
--- 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)