Skip to content

godeps update#958

Merged
jbenet merged 1 commit intomasterfrom
godeps
Mar 24, 2015
Merged

godeps update#958
jbenet merged 1 commit intomasterfrom
godeps

Conversation

@cryptix
Copy link
Contributor

@cryptix cryptix commented Mar 23, 2015

Motivation was the upstream fix of #956.

I updated jbenet/go-reuseport as well, which closes #943 for now. It was to big for one PR anyway.

This PR also contains large-ish upstream changes from the following deps:

  • Sirupsen/logrus
  • syndtr/goleveldb
  • syndtr/gosnappy

and a couple of smaller ones.

Also removes gorilla/context and gorilla/mux. I assume they could have been dropped since #887.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no idea why godep save -r ./... didn't pick up this one...

cc @jbenet - wait with merge until this is fixed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm even more confused now..

I cloned this branch into an empty GOPATH on two non-darwin machines and it builds fine..
Am I missing something about this syscallx package?

cc @tv42

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cryptix Not sure what you're talking about. That diff looks like commit 3c90b2396ff41bbe52a7b58b606d75cf47610a68 in bazil.org/fuse.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tv42 I was confused that godep didn't vendor golang.org/x/sys/unix and didn't rewrite the import path here to prefix/_workspace/src/...

My (way too nebulous) question for you was if the bazil.org/fuse/fs -> bazil.org/fuse/syscallx -> golang.org/x/sys/unix import chain is somehow conditional. I could have checked this myself this morning - syscallx is only included in the tests of bazil.org/fuse/fs so godep is correct (it doesn't respect test deps at all) with not including it.

My brain was only faking higher states of awareness, I guess. Sorry for the noise.

@jbenet we can move forward.

@jbenet
Copy link
Member

jbenet commented Mar 24, 2015

So many deps changing in one PR! LGTM

jbenet added a commit that referenced this pull request Mar 24, 2015
@jbenet jbenet merged commit b4da412 into master Mar 24, 2015
@jbenet jbenet removed the status/in-progress In progress label Mar 24, 2015
@jbenet jbenet deleted the godeps branch March 24, 2015 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants