coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-25 12:27:43 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge pull request #3022 from ipfs/feature/daemon-mount-offline-flag

Browse Source 
Feature/daemon mount offline flag
This commit is contained in:
Jeromy Johnson 2016-08-03 10:30:54 -07:00 committed by GitHub
commit ffba700ea6
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/ipfs/daemon.go
View File

@ -1,6 +1,7 @@
package main
import (
"errors"
_ "expvar"
"fmt"
"net"
@ -338,6 +339,11 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
res.SetError(err, cmds.ErrNormal)
return
}
if mount && offline {
res.SetError(errors.New("mount is not currently supported in offline mode"),
cmds.ErrClient)
return
}
if mount {
if err := mountFuse(req); err != nil {
res.SetError(err, cmds.ErrNormal)

7
test/sharness/t0600-issues-and-regressions-online.sh
View File

@ -24,10 +24,15 @@ test_expect_success "args expecting stdin dont crash when not given" '
'
test_expect_success "no panic traces on daemon" '
test_expect_failure grep "nil pointer dereference" daemon_err
test_must_fail grep "nil pointer dereference" daemon_err
'
test_kill_ipfs_daemon
test_expect_success "ipfs daemon --offline --mount fails - #2995" '
test_expect_code 1 ipfs daemon --offline --mount 2>daemon_err &&
grep "mount is not currently supported in offline mode" daemon_err
'
test_done