From 4d00937cecdea85b6f1eb894a6d28a53f5f2ff8a Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 13 Jul 2016 10:49:48 -0600 Subject: all: rename vendored golang.org/x/net packages to golang_org Regression from Go 1.6 to Go 1.7rc1: we had broken the ability for users to vendor "golang.org/x/net/http2" or "golang.org/x/net/route" because we were vendoring them ourselves and cmd/go and cmd/compile do not understand multiple vendor directories across multiple GOPATH workspaces (e.g. user's $GOPATH and default $GOROOT). As a short-term fix, since fixing cmd/go and cmd/compile is too invasive at this point in the cycle, just rename "golang.org" to "golang_org" for the standard library's vendored copy. Fixes #16333 Change-Id: I9bfaed91e9f7d4ca6bab07befe80d71d437a21af Reviewed-on: https://go-review.googlesource.com/24902 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/cmd/api/goapi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cmd/api') diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go index e9c91477c6..936f9e5511 100644 --- a/src/cmd/api/goapi.go +++ b/src/cmd/api/goapi.go @@ -425,7 +425,7 @@ func (w *Walker) Import(name string) (*types.Package, error) { w.imported[name] = &importing root := w.root - if strings.HasPrefix(name, "golang.org/x/") { + if strings.HasPrefix(name, "golang_org/x/") { root = filepath.Join(root, "vendor") } -- cgit v1.3