diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go index 7d2277fde..fbb0ef5ad 100644 --- a/fuse/ipns/ipns_test.go +++ b/fuse/ipns/ipns_test.go @@ -4,6 +4,7 @@ package ipns import ( "bytes" + "context" "fmt" "io/ioutil" mrand "math/rand" @@ -11,15 +12,15 @@ import ( "sync" "testing" - fstest "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil" - racedet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race" - - context "context" core "github.com/ipfs/go-ipfs/core" namesys "github.com/ipfs/go-ipfs/namesys" offroute "github.com/ipfs/go-ipfs/routing/offline" ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci" + + racedet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race" + u "gx/ipfs/QmZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util" + fstest "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs/fstestutil" ) func maybeSkipFuseTests(t *testing.T) { @@ -135,7 +136,7 @@ func setupIpnsTest(t *testing.T, node *core.IpfsNode) (*core.IpfsNode, *mountWra if err != nil { t.Fatal(err) } - mnt, err := fstest.MountedT(t, fs) + mnt, err := fstest.MountedT(t, fs, nil) if err != nil { t.Fatal(err) } diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go index 95fceff4d..bd87dec86 100644 --- a/fuse/ipns/ipns_unix.go +++ b/fuse/ipns/ipns_unix.go @@ -10,9 +10,6 @@ import ( "fmt" "os" - fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse" - fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs" - core "github.com/ipfs/go-ipfs/core" dag "github.com/ipfs/go-ipfs/merkledag" mfs "github.com/ipfs/go-ipfs/mfs" @@ -23,6 +20,8 @@ import ( logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" cid "gx/ipfs/QmV5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid" peer "gx/ipfs/QmZcUPvPhD1Xvk6mwijYF8AfR3mG31S1YsEfHG4khrFPRr/go-libp2p-peer" + fuse "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse" + fs "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs" ) func init() { diff --git a/fuse/ipns/link_unix.go b/fuse/ipns/link_unix.go index 0ba9157f7..a6b1fdd19 100644 --- a/fuse/ipns/link_unix.go +++ b/fuse/ipns/link_unix.go @@ -3,11 +3,11 @@ package ipns import ( + "context" "os" - "context" - "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse" - "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs" + "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse" + "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs" ) type Link struct { diff --git a/fuse/mount/fuse.go b/fuse/mount/fuse.go index 5308878ea..232afbd72 100644 --- a/fuse/mount/fuse.go +++ b/fuse/mount/fuse.go @@ -9,10 +9,9 @@ import ( "sync" "time" - "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse" - "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs" - - goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" + "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess" + "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse" + "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs" ) var ErrNotMounted = errors.New("not mounted") diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go index 902f0612f..2199cf9c3 100644 --- a/fuse/readonly/ipfs_test.go +++ b/fuse/readonly/ipfs_test.go @@ -22,10 +22,10 @@ import ( ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci" uio "github.com/ipfs/go-ipfs/unixfs/io" - fstest "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil" cid "gx/ipfs/QmV5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid" node "gx/ipfs/QmYDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node" u "gx/ipfs/QmZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util" + fstest "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs/fstestutil" ) func maybeSkipFuseTests(t *testing.T) { @@ -58,7 +58,7 @@ func setupIpfsTest(t *testing.T, node *core.IpfsNode) (*core.IpfsNode, *fstest.M } fs := NewFileSystem(node) - mnt, err := fstest.MountedT(t, fs) + mnt, err := fstest.MountedT(t, fs, nil) if err != nil { t.Fatal(err) } diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go index 7d56e6e41..79b22b049 100644 --- a/fuse/readonly/readonly_unix.go +++ b/fuse/readonly/readonly_unix.go @@ -4,23 +4,23 @@ package readonly import ( + "context" "fmt" "io" "os" "syscall" - "context" - logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" - proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" - - fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse" - fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs" core "github.com/ipfs/go-ipfs/core" mdag "github.com/ipfs/go-ipfs/merkledag" path "github.com/ipfs/go-ipfs/path" uio "github.com/ipfs/go-ipfs/unixfs/io" ftpb "github.com/ipfs/go-ipfs/unixfs/pb" + + logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" lgbl "gx/ipfs/QmTcfnDHimxBJqx6utpnWqVHdvyquXgkwAvYt4zMaJMKS2/go-libp2p-loggables" + proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" + fuse "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse" + fs "gx/ipfs/QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9/fuse/fs" ) var log = logging.Logger("fuse/ipfs") diff --git a/package.json b/package.json index e6d72eb11..804fe4626 100644 --- a/package.json +++ b/package.json @@ -294,6 +294,12 @@ "hash": "QmQ2sk2irQYkeMMVKpLjq1bSiNPn9B5wZB53Nx8dd4dhnQ", "name": "go-libp2p-pnet", "version": "2.2.1" + }, + { + "author": "kubuxu", + "hash": "QmaFNtBAXX4nVMQWbUqNysXyhevUj1k4B1y5uS45LC7Vw9", + "name": "fuse", + "version": "0.1.3" } ], "gxVersion": "0.10.0",