Skip to content

Commit 5865975

Browse files
committed
do an explicit import, always print right error message
cleanup imports License: MIT Signed-off-by: Jakub Sztandera <[email protected]>
1 parent 0c0363a commit 5865975

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

cmd/ipfs/main.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package main
33

44
import (
5+
"context"
56
"errors"
67
"fmt"
78
"io"
@@ -17,13 +18,6 @@ import (
1718
"syscall"
1819
"time"
1920

20-
manet "gx/ipfs/QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp/go-multiaddr-net"
21-
ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
22-
23-
context "context"
24-
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
25-
u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
26-
2721
cmds "github.com/ipfs/go-ipfs/commands"
2822
cmdsCli "github.com/ipfs/go-ipfs/commands/cli"
2923
cmdsHttp "github.com/ipfs/go-ipfs/commands/http"
@@ -33,8 +27,12 @@ import (
3327
config "github.com/ipfs/go-ipfs/repo/config"
3428
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
3529

30+
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
31+
manet "gx/ipfs/QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp/go-multiaddr-net"
3632
loggables "gx/ipfs/QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3/go-libp2p-loggables"
37-
"gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper"
33+
ma "gx/ipfs/QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH/go-multiaddr"
34+
osh "gx/ipfs/QmXuBJ7DR6k3rmUEKtvVMhwjmXDuJgXXPUt4LQXKBMsU93/go-os-helper"
35+
u "gx/ipfs/Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr/go-ipfs-util"
3836
)
3937

4038
// log is the command logger
@@ -622,6 +620,9 @@ func getApiClient(repoPath, apiAddrStr string) (cmdsHttp.Client, error) {
622620
if err != nil {
623621
return nil, err
624622
}
623+
if len(addr.Protocols()) == 0 {
624+
return nil, fmt.Errorf("mulitaddr doesn't provide any protocols")
625+
}
625626
} else {
626627
addr, err = fsrepo.APIAddr(repoPath)
627628
if err == repo.ErrApiNotRunning {

0 commit comments

Comments
 (0)