diff options
| author | Rebecca Turner <me@re-becca.org> | 2016-05-06 15:22:02 -0700 |
|---|---|---|
| committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2016-05-10 14:45:28 -0400 |
| commit | 5c36cfc8438d28ee5050ee6d5c383cf9c5b895fb (patch) | |
| tree | 6165b1b2ee92982a1e157ac29c924b516771780d /deps/npm/node_modules/read-package-json/read-json.js | |
| parent | 101dd1ed789175311ab22f9a32dfc480f127bc68 (diff) | |
| download | node-new-5c36cfc8438d28ee5050ee6d5c383cf9c5b895fb.tar.gz | |
deps: upgrade npm to 3.8.9
Contains the following three npm releases:
https://github.com/npm/npm/releases/tag/v3.8.7
https://github.com/npm/npm/releases/tag/v3.8.8
https://github.com/npm/npm/releases/tag/v3.8.9
PR-URL: https://github.com/nodejs/node/pull/6664
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/node_modules/read-package-json/read-json.js')
| -rw-r--r-- | deps/npm/node_modules/read-package-json/read-json.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/deps/npm/node_modules/read-package-json/read-json.js b/deps/npm/node_modules/read-package-json/read-json.js index 3f93603f89..b1888956c8 100644 --- a/deps/npm/node_modules/read-package-json/read-json.js +++ b/deps/npm/node_modules/read-package-json/read-json.js @@ -58,7 +58,18 @@ function stripBOM (content) { } function parseJson (file, er, d, log, strict, cb) { - if (er && er.code === 'ENOENT') return indexjs(file, er, log, strict, cb) + if (er && er.code === 'ENOENT') { + return fs.stat(path.dirname(file), function (err, stat) { + if (!err && stat && !stat.isDirectory()) { + // ENOTDIR isn't used on Windows, but npm expects it. + er = Object.create(er) + er.code = 'ENOTDIR' + return cb(er) + } else { + return indexjs(file, er, log, strict, cb) + } + }) + } if (er) return cb(er) try { |