diff options
| author | Kat Marchán <kzm@sykosomatic.org> | 2017-12-07 14:05:23 -0800 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2018-01-19 11:32:08 -0500 |
| commit | d3b1c971bcf0177b17c649c3aeca1a94cbc3fff5 (patch) | |
| tree | 321928c015be00cdbe11715297d2d2fc45802263 /deps/npm/node_modules/bluebird/js/release/util.js | |
| parent | bfe41fe88e7421f441067a79fb7512cf5935a2bb (diff) | |
| download | android-node-v8-d3b1c971bcf0177b17c649c3aeca1a94cbc3fff5.tar.gz android-node-v8-d3b1c971bcf0177b17c649c3aeca1a94cbc3fff5.tar.bz2 android-node-v8-d3b1c971bcf0177b17c649c3aeca1a94cbc3fff5.zip | |
deps: upgrade npm to 5.6.0
PR-URL: https://github.com/nodejs/node/pull/17777
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Diffstat (limited to 'deps/npm/node_modules/bluebird/js/release/util.js')
| -rw-r--r-- | deps/npm/node_modules/bluebird/js/release/util.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/deps/npm/node_modules/bluebird/js/release/util.js b/deps/npm/node_modules/bluebird/js/release/util.js index 84c28ec475..7ac0e2fa19 100644 --- a/deps/npm/node_modules/bluebird/js/release/util.js +++ b/deps/npm/node_modules/bluebird/js/release/util.js @@ -223,10 +223,11 @@ function safeToString(obj) { } function isError(obj) { - return obj !== null && + return obj instanceof Error || + (obj !== null && typeof obj === "object" && typeof obj.message === "string" && - typeof obj.name === "string"; + typeof obj.name === "string"); } function markAsOriginatingFromRejection(e) { |