summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/read-package-json/read-json.js
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2018-04-05 22:51:49 +0200
committerAnna Henningsen <anna@addaleax.net>2018-04-05 23:00:02 +0200
commite37effe4cec98688e75d770f4d0b7f68927e2b73 (patch)
treee7efa0fc8a2139f9aba4b66ea3f3613262f20cef /deps/npm/node_modules/read-package-json/read-json.js
parent026f6b787a7a23597790f1f0b076c58a68c7c38b (diff)
downloadandroid-node-v8-e37effe4cec98688e75d770f4d0b7f68927e2b73.tar.gz
android-node-v8-e37effe4cec98688e75d770f4d0b7f68927e2b73.tar.bz2
android-node-v8-e37effe4cec98688e75d770f4d0b7f68927e2b73.zip
Revert "deps: upgrade npm to 5.8.0"
This reverts commit 25a816dcda7b1db0929501acfe13f2fe5119759b. PR-URL: https://github.com/nodejs/node/pull/19837 Reviewed-By: Gus Caplan <me@gus.host>
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.js24
1 files changed, 4 insertions, 20 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 243af8e271..969bcc030b 100644
--- a/deps/npm/node_modules/read-package-json/read-json.js
+++ b/deps/npm/node_modules/read-package-json/read-json.js
@@ -339,26 +339,10 @@ function githead_ (file, data, dir, head, cb) {
data.gitHead = head.trim()
return cb(null, data)
}
- var headRef = head.replace(/^ref: /, '').trim()
- var headFile = path.resolve(dir, '.git', headRef)
+ var headFile = head.replace(/^ref: /, '').trim()
+ headFile = path.resolve(dir, '.git', headFile)
fs.readFile(headFile, 'utf8', function (er, head) {
- if (er || !head) {
- var packFile = path.resolve(dir, '.git/packed-refs')
- return fs.readFile(packFile, 'utf8', function (er, refs) {
- if (er || !refs) {
- return cb(null, data)
- }
- refs = refs.split('\n')
- for (var i = 0; i < refs.length; i++) {
- var match = refs[i].match(/^([0-9a-f]{40}) (.+)$/)
- if (match && match[2].trim() === headRef) {
- data.gitHead = match[1]
- break
- }
- }
- return cb(null, data)
- })
- }
+ if (er || !head) return cb(null, data)
head = head.replace(/^ref: /, '').trim()
data.gitHead = head
return cb(null, data)
@@ -387,7 +371,7 @@ function checkBinReferences_ (file, data, warn, cb) {
var relName = data.bin[key]
try {
var binPath = path.resolve(dirName, relName)
- fs.stat(binPath, (err) => handleExists(relName, !err))
+ fs.exists(binPath, handleExists.bind(null, relName))
} catch (error) {
if (error.message === 'Arguments to path.resolve must be strings' || error.message.indexOf('Path must be a string') === 0) {
warn('Bin filename for ' + key + ' is not a string: ' + util.inspect(relName))