diff options
author | Kat Marchán <kzm@sykosomatic.org> | 2015-07-17 02:16:43 +0300 |
---|---|---|
committer | Rebecca Turner <me@re-becca.org> | 2015-07-17 08:26:46 +0300 |
commit | d053ae367ed09bc86daac686b2be09150790afcf (patch) | |
tree | 1a365a4e298e992429f6c2616e1a8b943fe418bd /node_modules/glob | |
parent | 2b39c8f9323963f5190c4983e6b37336e167815c (diff) |
glob@5.0.14
Better handling of ENOTSUP
Diffstat (limited to 'node_modules/glob')
-rw-r--r-- | node_modules/glob/glob.js | 1 | ||||
-rw-r--r-- | node_modules/glob/package.json | 34 | ||||
-rw-r--r-- | node_modules/glob/sync.js | 3 |
3 files changed, 20 insertions, 18 deletions
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js index b343a7192..022d2ac8c 100644 --- a/node_modules/glob/glob.js +++ b/node_modules/glob/glob.js @@ -556,6 +556,7 @@ Glob.prototype._readdirError = function (f, er, cb) { // handle errors, and cache the information switch (er.code) { + case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205 case 'ENOTDIR': // totally normal. means it *does* exist. this.cache[this._makeAbs(f)] = 'FILE' break diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json index 76d36757a..3a43a56b1 100644 --- a/node_modules/glob/package.json +++ b/node_modules/glob/package.json @@ -1,12 +1,12 @@ { "_args": [ [ - "glob@~5.0.12", + "glob@~5.0.14", "/Users/rebecca/code/npm" ] ], - "_from": "glob@>=5.0.12 <5.1.0", - "_id": "glob@5.0.13", + "_from": "glob@>=5.0.14 <5.1.0", + "_id": "glob@5.0.14", "_inCache": true, "_location": "/glob", "_nodeVersion": "2.2.1", @@ -14,31 +14,31 @@ "email": "isaacs@npmjs.com", "name": "isaacs" }, - "_npmVersion": "3.0.0", + "_npmVersion": "3.1.0", "_phantomChildren": {}, "_requested": { "name": "glob", - "raw": "glob@~5.0.12", - "rawSpec": "~5.0.12", + "raw": "glob@~5.0.14", + "rawSpec": "~5.0.14", "scope": null, - "spec": ">=5.0.12 <5.1.0", + "spec": ">=5.0.14 <5.1.0", "type": "range" }, "_requiredBy": [ "/", - "/esformatter", "/fileset", "/init-package-json", "/read-package-json", "/standard", - "/standard-format", + "/standard/esformatter", + "/standard/standard-format", "/tap", "/tap-mocha-reporter" ], - "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.13.tgz", - "_shasum": "0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f", + "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.14.tgz", + "_shasum": "a811d507acb605441edd6cd2622a3c6f06cc00e1", "_shrinkwrap": null, - "_spec": "glob@~5.0.12", + "_spec": "glob@~5.0.14", "_where": "/Users/rebecca/code/npm", "author": { "email": "i@izs.me", @@ -64,8 +64,8 @@ }, "directories": {}, "dist": { - "shasum": "0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f", - "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.13.tgz" + "shasum": "a811d507acb605441edd6cd2622a3c6f06cc00e1", + "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.14.tgz" }, "engines": { "node": "*" @@ -75,7 +75,7 @@ "glob.js", "sync.js" ], - "gitHead": "507733d3c97f073ac676f58f2b6f2fe4c00f3e1c", + "gitHead": "c47d4514f8f93f23b589afa18947306116bfe40f", "homepage": "https://github.com/isaacs/node-glob#readme", "license": "ISC", "main": "glob.js", @@ -93,12 +93,12 @@ }, "scripts": { "bench": "bash benchmark.sh", - "benchclean": "bash benchclean.sh", + "benchclean": "node benchclean.js", "prepublish": "npm run benchclean", "prof": "bash prof.sh && cat profile.txt", "profclean": "rm -f v8.log profile.txt", "test": "tap test/*.js --cov", "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js" }, - "version": "5.0.13" + "version": "5.0.14" } diff --git a/node_modules/glob/sync.js b/node_modules/glob/sync.js index 78fada2c8..09883d2ce 100644 --- a/node_modules/glob/sync.js +++ b/node_modules/glob/sync.js @@ -57,7 +57,7 @@ GlobSync.prototype._finish = function () { for (var p in matchset) { try { p = self._makeAbs(p) - var real = fs.realpathSync(p, this.realpathCache) + var real = fs.realpathSync(p, self.realpathCache) set[real] = true } catch (er) { if (er.syscall === 'stat') @@ -303,6 +303,7 @@ GlobSync.prototype._readdirEntries = function (abs, entries) { GlobSync.prototype._readdirError = function (f, er) { // handle errors, and cache the information switch (er.code) { + case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205 case 'ENOTDIR': // totally normal. means it *does* exist. this.cache[this._makeAbs(f)] = 'FILE' break |