diff options
| author | Felix Lange <fjl@twurst.com> | 2017-05-30 17:21:59 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-06-21 15:56:58 +0800 |
| commit | 50c18e6eb818c26ff7b96c37a195686581783f6b (patch) | |
| tree | e9c3f7a7ad2a35942a25a1fad5c7e1be0b2b7395 /swarm/fuse/swarmfs_unix.go | |
| parent | 693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac (diff) | |
| download | go-tangerine-50c18e6eb818c26ff7b96c37a195686581783f6b.tar go-tangerine-50c18e6eb818c26ff7b96c37a195686581783f6b.tar.gz go-tangerine-50c18e6eb818c26ff7b96c37a195686581783f6b.tar.bz2 go-tangerine-50c18e6eb818c26ff7b96c37a195686581783f6b.tar.lz go-tangerine-50c18e6eb818c26ff7b96c37a195686581783f6b.tar.xz go-tangerine-50c18e6eb818c26ff7b96c37a195686581783f6b.tar.zst go-tangerine-50c18e6eb818c26ff7b96c37a195686581783f6b.zip | |
swarm/fuse: simplify externalUnmount
The code looked for /usr/bin/diskutil on darwin, but it's actually
located in /usr/sbin. Fix that by not specifying the absolute path.
Also remove weird timeout construction and extra whitespace.
Diffstat (limited to 'swarm/fuse/swarmfs_unix.go')
| -rw-r--r-- | swarm/fuse/swarmfs_unix.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index f4eecef24..1a8390a4b 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -19,18 +19,19 @@ package fuse import ( - "bazil.org/fuse" - "bazil.org/fuse/fs" "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" "os" "path/filepath" "strings" "sync" "time" + + "bazil.org/fuse" + "bazil.org/fuse/fs" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/swarm/api" ) var ( @@ -203,7 +204,7 @@ func (self *SwarmFS) Unmount(mountpoint string) (*MountInfo, error) { } err = fuse.Unmount(cleanedMountPoint) if err != nil { - err1 := externalUnMount(cleanedMountPoint) + err1 := externalUnmount(cleanedMountPoint) if err1 != nil { errStr := fmt.Sprintf("UnMount error: %v", err) log.Warn(errStr) |