diff options
| author | Kat Marchán <kzm@sykosomatic.org> | 2017-06-06 00:53:35 +0300 |
|---|---|---|
| committer | Kat Marchán <kzm@sykosomatic.org> | 2017-06-06 00:53:35 +0300 |
| commit | 662a15ab7e790e87f5e5a35252f05d5a4a0724a1 (patch) | |
| tree | 33728d32ab9c55279fbae14cb713c4f0eb213b28 /lib | |
| parent | 346cb006e7d0fab674e40c31cb47008bf36ee169 (diff) | |
doctor: new cacache sets content files to be read-only
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/doctor.js | 6 | ||||
| -rw-r--r-- | lib/doctor/check-files-permission.js | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/doctor.js b/lib/doctor.js index 357ba91a5..95ede1bc8 100644 --- a/lib/doctor.js +++ b/lib/doctor.js @@ -39,9 +39,9 @@ function doctor (args, silent, cb) { [getLatestNpmVersion], [getLatestNodejsVersion, args['node-url']], [getGitPath], - [checkFilesPermission, npm.cache, 6], - [checkFilesPermission, globalNodeModules, 4], - [checkFilesPermission, localNodeModules, 6], + [checkFilesPermission, npm.cache, 4, 6], + [checkFilesPermission, globalNodeModules, 4, 4], + [checkFilesPermission, localNodeModules, 6, 6], [verifyCachedFiles, path.join(npm.cache, '_cacache')] ] diff --git a/lib/doctor/check-files-permission.js b/lib/doctor/check-files-permission.js index 50014fd23..1cefb6e64 100644 --- a/lib/doctor/check-files-permission.js +++ b/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)) |