diff options
| author | Forrest L Norvell <forrest@npmjs.com> | 2015-02-27 05:54:37 -0800 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-03-03 14:45:37 -0800 |
| commit | 63fbd10b6cdea195bfbc55221d8fe279757d56cc (patch) | |
| tree | e49b0d0e10bc0b558d9d004708d9a4c84d518235 /deps/npm/node_modules/glob/glob.js | |
| parent | d9a309f718d738eb817195118f4daa06fb6f68ee (diff) | |
| download | node-63fbd10b6cdea195bfbc55221d8fe279757d56cc.tar.gz | |
deps: upgrade npm to 2.6.1
PR: #9297
PR-URL: https://github.com/joyent/node/pull/9297
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/npm/node_modules/glob/glob.js')
| -rw-r--r-- | deps/npm/node_modules/glob/glob.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/deps/npm/node_modules/glob/glob.js b/deps/npm/node_modules/glob/glob.js index 7401e0b7e..0075c1fb8 100644 --- a/deps/npm/node_modules/glob/glob.js +++ b/deps/npm/node_modules/glob/glob.js @@ -56,6 +56,7 @@ var setopts = common.setopts var ownProp = common.ownProp var inflight = require('inflight') var util = require('util') +var childrenIgnored = common.childrenIgnored var once = require('once') @@ -270,6 +271,10 @@ Glob.prototype._process = function (pattern, index, inGlobStar, cb) { var abs = this._makeAbs(read) + //if ignored, skip _processing + if (childrenIgnored(this, read)) + return cb() + var isGlobStar = remain[0] === minimatch.GLOBSTAR if (isGlobStar) this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb) @@ -277,7 +282,6 @@ Glob.prototype._process = function (pattern, index, inGlobStar, cb) { this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb) } - Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) { var self = this this._readdir(abs, inGlobStar, function (er, entries) { |