From e76b14aef05acb8ca797946998f2f9366035d848 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Tue, 22 Nov 2016 14:52:00 +0100 Subject: [PATCH] fuse: Parse OSX fuse version properly License: MIT Signed-off-by: Jakub Sztandera --- fuse/node/mount_darwin.go | 14 +++++++++++--- package.json | 6 ++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/fuse/node/mount_darwin.go b/fuse/node/mount_darwin.go index e1d287227..a743763ba 100644 --- a/fuse/node/mount_darwin.go +++ b/fuse/node/mount_darwin.go @@ -11,6 +11,8 @@ import ( "syscall" core "github.com/ipfs/go-ipfs/core" + + "gx/ipfs/QmU1N5xVAUXgo3XRTt6GhJ2SuJEbxj2zRgMS7FpjSR2U83/semver" ) func init() { @@ -138,11 +140,17 @@ func darwinFuseCheckVersion(node *core.IpfsNode) error { } log.Debug("mount: osxfuse version:", ov) - if strings.HasPrefix(ov, "2.7.") || strings.HasPrefix(ov, "2.8.") { - return nil + + min := semver.MustParse("2.7.2") + curr, err := semver.Make(ov) + if err != nil { + return err } - return fmt.Errorf(errStrUpgradeFuse, ov) + if curr.LT(min) { + return fmt.Errorf(errStrUpgradeFuse, ov) + } + return nil } func tryGFV() (string, error) { diff --git a/package.json b/package.json index 20e3e5a06..36270e729 100644 --- a/package.json +++ b/package.json @@ -293,6 +293,12 @@ "hash": "QmXGevGDVTqeKdisBzaxEK4CJZqfxeXiVSWLaXaVWcG5on", "name": "go-smux-multiplex", "version": "1.1.4" + }, + { + "author": "blang", + "hash": "QmU1N5xVAUXgo3XRTt6GhJ2SuJEbxj2zRgMS7FpjSR2U83", + "name": "semver", + "version": "3.3.0" } ], "gxVersion": "0.4.0",