From bfd595a713377517c7379dbbf2a04f04d94eb647 Mon Sep 17 00:00:00 2001 From: ehmicky Date: Sun, 3 May 2020 17:04:39 +0200 Subject: [PATCH] Fix checking for Error instances --- lib/error.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/error.js b/lib/error.js index ea04b909f0..09cd081d53 100644 --- a/lib/error.js +++ b/lib/error.js @@ -48,10 +48,11 @@ const makeError = ({ const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}); const execaMessage = `Command ${prefix}: ${command}`; - const shortMessage = error instanceof Error ? `${execaMessage}\n${error.message}` : execaMessage; + const isError = Object.prototype.toString.call(error) === '[object Error]'; + const shortMessage = isError ? `${execaMessage}\n${error.message}` : execaMessage; const message = [shortMessage, stderr, stdout].filter(Boolean).join('\n'); - if (error instanceof Error) { + if (isError) { error.originalMessage = error.message; error.message = message; } else {