make swarm connect return an error when it fails

whyrusleeping · whyrusleeping · commit 9094345875cc · 2015-10-25T13:15:14.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
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})

Original file line number	Diff line number	Diff line change
`@@ -237,10 +237,10 @@ ipfs swarm connect /ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3`
`237`	`237`
`238`	`238`	`err := n.PeerHost.Connect(ctx, pi)`
`239`	`239`	`if err != nil {`
`240`		`- output[i] += " failure: " + err.Error()`
`241`		`- } else {`
`242`		`- output[i] += " success"`
	`240`	`+ res.SetError(fmt.Errorf("%s failure: %s", output[i], err), cmds.ErrNormal)`
	`241`	`+ return`
`243`	`242`	`}`
	`243`	`+ output[i] += " success"`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`res.SetOutput(&stringList{output})`