diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-09-24 14:41:07 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-09-24 17:15:10 -0700 |
| commit | 9fad8958df671c0e894506ef59b4c781c3dfb349 (patch) | |
| tree | 4db7643b40c4ffd726fb27fb4aa276d420b3bfd8 /deps/npm/bin | |
| parent | b26dd4e5ab9192bad72b9dc61fa4ad2d8f215da2 (diff) | |
| download | android-node-v8-9fad8958df671c0e894506ef59b4c781c3dfb349.tar.gz android-node-v8-9fad8958df671c0e894506ef59b4c781c3dfb349.tar.bz2 android-node-v8-9fad8958df671c0e894506ef59b4c781c3dfb349.zip | |
deps: upgrade npm to 2.0.0
Diffstat (limited to 'deps/npm/bin')
| -rwxr-xr-x | deps/npm/bin/npm-cli.js | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js index ef8873542b..ed81a989a3 100755 --- a/deps/npm/bin/npm-cli.js +++ b/deps/npm/bin/npm-cli.js @@ -19,8 +19,7 @@ var log = require("npmlog") log.pause() // will be unpaused when config is loaded. log.info("it worked if it ends with", "ok") -var fs = require("graceful-fs") - , path = require("path") +var path = require("path") , npm = require("../lib/npm.js") , npmconf = require("npmconf") , errorHandler = require("../lib/utils/error-handler.js") @@ -58,16 +57,6 @@ if (conf.versions) { log.info("using", "npm@%s", npm.version) log.info("using", "node@%s", process.version) -// make sure that this version of node works with this version of npm. -var semver = require("semver") - , nodeVer = process.version - , reqVer = npm.nodeVersionRequired -if (reqVer && !semver.satisfies(nodeVer, reqVer)) { - return errorHandler(new Error( - "npm doesn't work with node " + nodeVer - + "\nRequired: node@" + reqVer), true) -} - process.on("uncaughtException", errorHandler) if (conf.usage && npm.command !== "help") { |