Simplify context canceled err message

rht · rht · commit 3109b5913f44 · 2015-11-23T08:33:07.000+07:00
License: MIT
Signed-off-by: rht &lt;rhtbot@gmail.com&gt;
diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
@@ -328,7 +328,7 @@ func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd
 			if isConnRefused(err) {
 				err = repo.ErrApiNotRunning
 			}
-			return nil, err
+			return nil, wrapContextCanceled(err)
 		}
 
 	} else {
@@ -685,3 +685,10 @@ func isConnRefused(err error) bool {
 
 	return netoperr.Op == "dial"
 }
+
+func wrapContextCanceled(err error) error {
+	if strings.Contains(err.Error(), "request canceled") {
+		err = errors.New("request canceled")
+	}
+	return err
+}

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd`
`328`	`328`	`if isConnRefused(err) {`
`329`	`329`	`err = repo.ErrApiNotRunning`
`330`	`330`	`}`
`331`		`- return nil, err`
	`331`	`+ return nil, wrapContextCanceled(err)`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`} else {`
`@@ -685,3 +685,10 @@ func isConnRefused(err error) bool {`
`685`	`685`
`686`	`686`	`return netoperr.Op == "dial"`
`687`	`687`	`}`
	`688`	`+`
	`689`	`+func wrapContextCanceled(err error) error {`
	`690`	`+ if strings.Contains(err.Error(), "request canceled") {`
	`691`	`+ err = errors.New("request canceled")`
	`692`	`+ }`
	`693`	`+ return err`
	`694`	`+}`