Merge pull request #1900 from ipfs/fix/swarm-con-err

make swarm connect return an error when it fails
ipfs · Oct 28, 2015 · 62cb6eb · 62cb6eb
2 parents 4022d8b + 9094345
commit 62cb6eb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/commands/swarm.go b/core/commands/swarm.go
@@ -237,10 +237,10 @@ ipfs swarm connect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3
 
 			err := n.PeerHost.Connect(ctx, pi)
 			if err != nil {
-				output[i] += " failure: " + err.Error()
-			} else {
-				output[i] += " success"
+				res.SetError(fmt.Errorf("%s failure: %s", output[i], err), cmds.ErrNormal)
+				return
 			}
+			output[i] += " success"
 		}
 
 		res.SetOutput(&stringList{output})