glob@5.0.7

4 files changed, 22 insertions, 12 deletions

diff --git a/node_modules/glob/common.js b/node_modules/glob/common.js
index 7bef9a27d..e36a631ca 100644
--- a/node_modules/glob/common.js
+++ b/node_modules/glob/common.js
@@ -61,6 +61,7 @@ function setopts (self, pattern, options) {
     pattern = "**/" + pattern
   }
 
+  self.silent = !!options.silent
   self.pattern = pattern
   self.strict = options.strict !== false
   self.realpath = !!options.realpath
diff --git a/node_modules/glob/glob.js b/node_modules/glob/glob.js
index 1bfed19d2..d8ac4eff6 100644
--- a/node_modules/glob/glob.js
+++ b/node_modules/glob/glob.js
@@ -565,10 +565,17 @@ Glob.prototype._readdirError = function (f, er, cb) {
 
     default: // some unusual error.  Treat as failure.
       this.cache[this._makeAbs(f)] = false
-      if (this.strict) return this.emit('error', er)
-      if (!this.silent) console.error('glob error', er)
+      if (this.strict) {
+        this.emit('error', er)
+        // If the error is handled, then we abort
+        // if not, we threw out of here
+        this.abort()
+      }
+      if (!this.silent)
+        console.error('glob error', er)
       break
   }
+
   return cb()
 }
 
diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json
index d2276e1b2..5a5af13b7 100644
--- a/node_modules/glob/package.json
+++ b/node_modules/glob/package.json
@@ -6,7 +6,7 @@
   },
   "name": "glob",
   "description": "a little globber",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/node-glob.git"
@@ -43,23 +43,23 @@
     "benchclean": "bash benchclean.sh"
   },
   "license": "ISC",
-  "gitHead": "7a0d65d7ed11871be6b5a68dc6f15e3f4b3fb93d",
+  "gitHead": "cfd963c3c95e51864d69092e32479ddb73c3278e",
   "bugs": {
     "url": "https://github.com/isaacs/node-glob/issues"
   },
   "homepage": "https://github.com/isaacs/node-glob#readme",
-  "_id": "glob@5.0.6",
-  "_shasum": "51f1377c8d5ba36015997655d22bd7d20246accd",
+  "_id": "glob@5.0.7",
+  "_shasum": "9748021208e3fd7c3bcc7167ddbd2f1f94676a43",
   "_from": "glob@>=5.0.6 <5.1.0",
-  "_npmVersion": "2.9.1",
+  "_npmVersion": "2.10.0",
   "_nodeVersion": "2.0.1",
   "_npmUser": {
     "name": "isaacs",
     "email": "isaacs@npmjs.com"
   },
   "dist": {
-    "shasum": "51f1377c8d5ba36015997655d22bd7d20246accd",
-    "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.6.tgz"
+    "shasum": "9748021208e3fd7c3bcc7167ddbd2f1f94676a43",
+    "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.7.tgz"
   },
   "maintainers": [
     {
@@ -68,5 +68,5 @@
     }
   ],
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.6.tgz"
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.7.tgz"
 }
diff --git a/node_modules/glob/sync.js b/node_modules/glob/sync.js
index 92fe11019..78fada2c8 100644
--- a/node_modules/glob/sync.js
+++ b/node_modules/glob/sync.js
@@ -316,8 +316,10 @@ GlobSync.prototype._readdirError = function (f, er) {
 
     default: // some unusual error.  Treat as failure.
       this.cache[this._makeAbs(f)] = false
-      if (this.strict) throw er
-      if (!this.silent) console.error('glob error', er)
+      if (this.strict)
+        throw er
+      if (!this.silent)
+        console.error('glob error', er)
       break
   }
 }