diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-07-13 10:49:48 -0600 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-07-13 18:35:40 +0000 |
| commit | 4d00937cecdea85b6f1eb894a6d28a53f5f2ff8a (patch) | |
| tree | e394c817134f527ac6b33d619464166ac3a218af /src/cmd/api | |
| parent | 1cb3f7169ccff3ae2197784676404e8d0d3f5e32 (diff) | |
| download | go-4d00937cecdea85b6f1eb894a6d28a53f5f2ff8a.tar.xz | |
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 <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/cmd/api')
| -rw-r--r-- | src/cmd/api/goapi.go | 2 |
1 files changed, 1 insertions, 1 deletions
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") } |