Skip to content
This repository was archived by the owner on Mar 6, 2020. It is now read-only.

cmd/gb-vendor: search $GOROOT/src/vendor when resolving recursive deps #640

Merged
merged 2 commits into from
Jul 24, 2016

Conversation

davecheney
Copy link
Contributor

Fixes #635

golang/go#16333 renamed $GOROOT/src/vendor/golang.org to
$GOROOT/src/vendor/golang_org. This solved a nasty problem where code in
GOROOT would shadow any other copy of the net/http2 library, but meant
that gb vendor could no longer resolve the package and try to fetch it
(even if that was pointless).

To solve this, include $GOROOT/src/vendor in the set of search paths so
that golang_org/net/http/... is always found (if present).

I'll add a test for this in the integration test repo.

Fixes #635

golang/go#16333 renamed $GOROOT/src/vendor/golang.org to
$GOROOT/src/vendor/golang_org. This solved a nasty problem where code in
GOROOT would shadow any other copy of the net/http2 library, but meant
that gb vendor could no longer resolve the package and try to fetch it
(even if that was pointless).

To solve this, include $GOROOT/src/vendor in the set of search paths so
that golang_org/net/http/... is always found (if present).

I'll add a test for this in the integration test repo.
$GOROOT/src/vendor does not exist in Go < 1.6
@davecheney davecheney merged commit 065d2b2 into master Jul 24, 2016
@davecheney davecheney deleted the fixedbugs/635 branch July 24, 2016 06:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Go 1.7rc1 - can't find import: "golang.org/x/net/http2/hpack"
1 participant