diff options
| author | isaacs <i@izs.me> | 2020-02-26 17:11:08 -0800 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2020-04-01 17:59:42 -0400 |
| commit | 17217a5275e168c87935c981841dbd1343baa51e (patch) | |
| tree | f1a53d72c61b451a7963174e0337c95e5cc8d304 /deps/npm/lib/utils/error-handler.js | |
| parent | fbd5be673417680284a1e863ecfa54f8d52344c4 (diff) | |
| download | node-new-17217a5275e168c87935c981841dbd1343baa51e.tar.gz | |
deps: upgrade npm to 6.14.1
Backport-PR-URL: https://github.com/nodejs/node/pull/32527
PR-URL: https://github.com/nodejs/node/pull/31977
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'deps/npm/lib/utils/error-handler.js')
| -rw-r--r-- | deps/npm/lib/utils/error-handler.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/deps/npm/lib/utils/error-handler.js b/deps/npm/lib/utils/error-handler.js index 39e0035c27..3e6f176ef8 100644 --- a/deps/npm/lib/utils/error-handler.js +++ b/deps/npm/lib/utils/error-handler.js @@ -36,7 +36,7 @@ process.on('timing', function (name, value) { process.on('exit', function (code) { process.emit('timeEnd', 'npm') log.disableProgress() - if (npm.config.loaded && npm.config.get('timing')) { + if (npm.config && npm.config.loaded && npm.config.get('timing')) { try { timings.logfile = getLogFile() cacheFile.append('_timing.json', JSON.stringify(timings) + '\n') @@ -64,7 +64,7 @@ process.on('exit', function (code) { log.verbose('code', code) } } - if (npm.config.loaded && npm.config.get('timing') && !wroteLogFile) writeLogFile() + if (npm.config && npm.config.loaded && npm.config.get('timing') && !wroteLogFile) writeLogFile() if (wroteLogFile) { // just a line break if (log.levels[log.level] <= log.levels.error) console.error('') @@ -79,7 +79,7 @@ process.on('exit', function (code) { wroteLogFile = false } - var doExit = npm.config.loaded && npm.config.get('_exit') + var doExit = npm.config && npm.config.loaded && npm.config.get('_exit') if (doExit) { // actually exit. if (exitCode === 0 && !itWorked) { @@ -94,7 +94,7 @@ process.on('exit', function (code) { function exit (code, noLog) { exitCode = exitCode || process.exitCode || code - var doExit = npm.config.loaded ? npm.config.get('_exit') : true + var doExit = npm.config && npm.config.loaded ? npm.config.get('_exit') : true log.verbose('exit', [code, doExit]) if (log.level === 'silent') noLog = true |