Skip to content

Commit

Permalink
Merge 4ce794c into 659f444
Browse files Browse the repository at this point in the history
  • Loading branch information
ehmicky committed May 9, 2019
2 parents 659f444 + 4ce794c commit 35b014e
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions index.js
Expand Up @@ -358,7 +358,7 @@ const execa = (command, args, options) => {
result.stderr = results[2];
result.all = results[3];

if (result.error || result.code !== 0 || result.signal !== null || isCanceled) {
if (result.error || result.code !== 0 || result.signal !== null) {
const error = makeError(result, {
joinedCommand,
parsed,
Expand Down Expand Up @@ -407,10 +407,6 @@ const execa = (command, args, options) => {
spawned.then = (onFulfilled, onRejected) => handlePromise().then(onFulfilled, onRejected);
spawned.catch = onRejected => handlePromise().catch(onRejected);
spawned.cancel = () => {
if (spawned.killed) {
return;
}

if (spawned.kill()) {
isCanceled = true;
}
Expand Down

0 comments on commit 35b014e

Please sign in to comment.