deps: upgrade to npm 2.14.4

[platform/upstream/nodejs.git] / deps / npm / node_modules / node-gyp / lib / process-release.js

diff --git a/deps/npm/node_modules/node-gyp/lib/process-release.js b/deps/npm/node_modules/node-gyp/lib/process-release.js
index 2a574f4..2da45eb 100644 (file)
--- a/deps/npm/node_modules/node-gyp/lib/process-release.js
+++ b/deps/npm/node_modules/node-gyp/lib/process-release.js
@@ -10,7 +10,7 @@ var semver = require('semver')
 // file names. Inputs come from command-line switches (--target, --dist-url),
 // `process.version` and `process.release` where it exists.
 function processRelease (argv, gyp, defaultVersion, defaultRelease) {
-  var version = (semver.valid(argv[0]) && argv[0]) || gyp.opts.target || defaultVersion
+  var version = argv[0] || gyp.opts.target || defaultVersion
     , versionSemver = semver.parse(version)
     , overrideDistUrl = gyp.opts['dist-url'] || gyp.opts.disturl
     , isDefaultVersion
@@ -20,7 +20,6 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
     , baseUrl
     , libUrl32
     , libUrl64
-    , tarballUrl
 
   if (!versionSemver) {
     // not a valid semver string, nothing we can do
@@ -43,7 +42,7 @@ function processRelease (argv, gyp, defaultVersion, defaultRelease) {
   } else {
     // old node or alternative --target=
     // semver.satisfies() doesn't like prerelease tags so test major directly
-    isIojs = versionSemver.major >= 1 && versionSemver.major < 4
+    isIojs = versionSemver.major >= 1 & versionSemver.major < 4
     name = isIojs ? 'iojs' : 'node'
   }