diff options
| author | Kat Marchán <kzm@sykosomatic.org> | 2017-06-05 16:31:14 -0700 |
|---|---|---|
| committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2017-06-06 14:27:48 -0400 |
| commit | a4444c546211cac0f5efba8b03a681546e3e184f (patch) | |
| tree | a378b37fefd4fac786850c41f32eee8d07e339c7 /deps/npm/lib/doctor/check-files-permission.js | |
| parent | df46fcb61a6f64cebffd26c8dbd4f24c8058fe25 (diff) | |
| download | android-node-v8-a4444c546211cac0f5efba8b03a681546e3e184f.tar.gz android-node-v8-a4444c546211cac0f5efba8b03a681546e3e184f.tar.bz2 android-node-v8-a4444c546211cac0f5efba8b03a681546e3e184f.zip | |
deps: upgrade npm to 5.0.3
PR-URL: https://github.com/nodejs/node/pull/13487
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/lib/doctor/check-files-permission.js')
| -rw-r--r-- | deps/npm/lib/doctor/check-files-permission.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/npm/lib/doctor/check-files-permission.js b/deps/npm/lib/doctor/check-files-permission.js index 50014fd232..1cefb6e64c 100644 --- a/deps/npm/lib/doctor/check-files-permission.js +++ b/deps/npm/lib/doctor/check-files-permission.js @@ -6,7 +6,7 @@ var log = require('npmlog') var npm = require('../npm.js') var fileCompletion = require('../utils/completion/file-completion.js') -function checkFilesPermission (root, mask, cb) { +function checkFilesPermission (root, fmask, dmask, cb) { if (process.platform === 'win32') return cb(null, true) getUid(npm.config.get('user'), npm.config.get('group'), function (e, uid, gid) { var tracker = log.newItem('checkFilePermissions', 1) @@ -37,10 +37,10 @@ function checkFilesPermission (root, mask, cb) { fs.lstat(file, function (e, stat) { tracker.completeWork(1) if (e) return next(e) - if (!stat.isFile()) return next() + if (!stat.isDirectory() && !stat.isFile()) return next() // 6 = fs.constants.R_OK | fs.constants.W_OK // constants aren't available on v4 - fs.access(file, 6, (err) => { + fs.access(file, stat.isFile() ? fmask : dmask, (err) => { if (err) { tracker.error('checkFilePermissions', `Missing permissions on ${file}`) return next(new Error('Missing permissions for ' + file)) |