diff options
| author | Rebecca Turner <me@re-becca.org> | 2018-04-20 18:26:37 -0700 |
|---|---|---|
| committer | Rebecca Turner <me@re-becca.org> | 2018-05-24 23:24:45 -0700 |
| commit | 468ab4519e1b92473acefb22801497a1af6aebae (patch) | |
| tree | bdac1d062cd4b094bde3a21147bab5d82c792ece /deps/npm/lib/install/action/extract-worker.js | |
| parent | ac8226115e2192a7a46ba07789fa5136f74223e1 (diff) | |
| download | android-node-v8-468ab4519e1b92473acefb22801497a1af6aebae.tar.gz android-node-v8-468ab4519e1b92473acefb22801497a1af6aebae.tar.bz2 android-node-v8-468ab4519e1b92473acefb22801497a1af6aebae.zip | |
deps: upgrade npm to 6.1.0
PR-URL: https://github.com/nodejs/node/pull/20190
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Diffstat (limited to 'deps/npm/lib/install/action/extract-worker.js')
| -rw-r--r-- | deps/npm/lib/install/action/extract-worker.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/npm/lib/install/action/extract-worker.js b/deps/npm/lib/install/action/extract-worker.js index 24508c7804..2b082b4a57 100644 --- a/deps/npm/lib/install/action/extract-worker.js +++ b/deps/npm/lib/install/action/extract-worker.js @@ -10,9 +10,9 @@ module.exports = (args, cb) => { const spec = parsed[0] const extractTo = parsed[1] const opts = parsed[2] - if (!opts.log && opts.loglevel) { + if (!opts.log) { opts.log = npmlog - opts.log.level = opts.loglevel } + opts.log.level = opts.loglevel || opts.log.level BB.resolve(extract(spec, extractTo, opts)).nodeify(cb) } |