fuse: Parse OSX fuse version properly
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Nov 22, 2016 at 14:52 UTC
e76b14aef05acb8ca797946998f2f9366035d848
2 files changed
+17
-3
fuse/node/mount_darwin.go
+11
-3
@@ -11,6 +11,8 @@ import (
11
"syscall"
12
13
core "github.com/ipfs/go-ipfs/core"
14
+
15
+ "gx/ipfs/QmU1N5xVAUXgo3XRTt6GhJ2SuJEbxj2zRgMS7FpjSR2U83/semver"
16
)
17
18
func init() {
@@ -138,11 +140,17 @@ func darwinFuseCheckVersion(node *core.IpfsNode) error {
140
}
141
142
log.Debug("mount: osxfuse version:", ov)
141
- if strings.HasPrefix(ov, "2.7.") || strings.HasPrefix(ov, "2.8.") {
142
- return nil
143
+
144
+ min := semver.MustParse("2.7.2")
145
+ curr, err := semver.Make(ov)
146
+ if err != nil {
147
+ return err
148
}
149
145
- return fmt.Errorf(errStrUpgradeFuse, ov)
150
+ if curr.LT(min) {
151
+ return fmt.Errorf(errStrUpgradeFuse, ov)
152
+ }
153
+ return nil
154
}
155
156
func tryGFV() (string, error) {
package.json
+6
@@ -293,6 +293,12 @@
293
"hash": "QmXGevGDVTqeKdisBzaxEK4CJZqfxeXiVSWLaXaVWcG5on",
294
"name": "go-smux-multiplex",
295
"version": "1.1.4"
296
+ },
297
+ {
298
+ "author": "blang",
299
+ "hash": "QmU1N5xVAUXgo3XRTt6GhJ2SuJEbxj2zRgMS7FpjSR2U83",
300
+ "name": "semver",
301
+ "version": "3.3.0"
302
}
303
],
304
"gxVersion": "0.4.0",