diff options
| author | Kat Marchán <kzm@sykosomatic.org> | 2015-07-20 20:07:07 -0700 |
|---|---|---|
| committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2015-07-21 11:54:30 -0700 |
| commit | 04893a736dd5132ac117190287b6e345579f9a64 (patch) | |
| tree | 6fe7554a68068b2a838f96dac0952c985f5afdb7 /deps/npm/lib/utils | |
| parent | 6391f4d2fd7a5779e012887158e6bc69d08966e3 (diff) | |
| download | android-node-v8-04893a736dd5132ac117190287b6e345579f9a64.tar.gz android-node-v8-04893a736dd5132ac117190287b6e345579f9a64.tar.bz2 android-node-v8-04893a736dd5132ac117190287b6e345579f9a64.zip | |
deps: upgrade to npm 2.13.1
PR-URL: https://github.com/nodejs/io.js/pull/2210
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/lib/utils')
| -rw-r--r-- | deps/npm/lib/utils/lifecycle.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/deps/npm/lib/utils/lifecycle.js b/deps/npm/lib/utils/lifecycle.js index 299fa56988..a6f2b98e88 100644 --- a/deps/npm/lib/utils/lifecycle.js +++ b/deps/npm/lib/utils/lifecycle.js @@ -39,8 +39,9 @@ function lifecycle (pkg, stage, wd, unsafe, failOk, cb) { unsafe = unsafe || npm.config.get("unsafe-perm") - if ((wd.indexOf(npm.dir) !== 0 || path.basename(wd) !== pkg.name) - && !unsafe && pkg.scripts[stage]) { + if ((wd.indexOf(npm.dir) !== 0 || + wd.indexOf(pkg.name) !== wd.length - pkg.name.length) && + !unsafe && pkg.scripts[stage]) { log.warn( "cannot run in wd", "%s %s (wd=%s)" , pkg._id, pkg.scripts[stage], wd) return cb() |