do an explicit import, always print right error message

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
ipfs · Oct 4, 2016 · 3b89cf4 · 3b89cf4
1 parent 41eaa8c
commit 3b89cf4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
@@ -27,7 +27,7 @@ import (
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 
 	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
-	"gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper"
+	osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper"
 	manet "gx/ipfs/QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff/go-multiaddr-net"
 	loggables "gx/ipfs/QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7/go-libp2p-loggables"
 	ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
@@ -620,6 +620,9 @@ func getApiClient(repoPath, apiAddrStr string) (cmdsHttp.Client, error) {
 		if err != nil {
 			return nil, err
 		}
+		if len(addr.Protocols()) == 0 {
+			return nil, fmt.Error("mulitaddr doesn't provide any protocols")
+		}
 	} else {
 		addr, err = fsrepo.APIAddr(repoPath)
 		if err == repo.ErrApiNotRunning {