Merge pull request #4437 from ipfs/fix/add-abort-panic

Fix/add abort panic

Merge pull request #4437 from ipfs/fix/add-abort-panic
Fix/add abort panic
d4add99a · Whyrusleeping · GitHub · a81025f8 · a3a31793 · d4add99a
Unverified Commit d4add99a authored Nov 30, 2017 by Whyrusleeping Committed by GitHub Nov 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

cmd/ipfs/main.go cmd/ipfs/main.go +5 -2

No files found.
--- a/cmd/ipfs/main.go
+++ b/cmd/ipfs/main.go
@@ -364,9 +364,12 @@ func callCommand(ctx context.Context, req cmds.Request, root *cmds.Command, cmd
 		}

 		go func() {
-			err = cmds.Copy(re, res)
+			err := cmds.Copy(re, res)
 			if err != nil {
-				re.SetError(err, cmdkit.ErrNormal|cmdkit.ErrFatal)
+				err = re.Emit(cmdkit.Error{err.Error(), cmdkit.ErrNormal | cmdkit.ErrFatal})
+				if err != nil {
+					log.Error(err)
+				}
 			}
 		}()
 	} else {