rimraf@2.6.1

4 files changed, 33 insertions, 30 deletions

diff --git a/node_modules/rimraf/package.json b/node_modules/rimraf/package.json
index 0543429f9..7efb7ea28 100644
--- a/node_modules/rimraf/package.json
+++ b/node_modules/rimraf/package.json
@@ -2,25 +2,25 @@
   "_args": [
     [
       {
-        "raw": "rimraf@2.6.0",
+        "raw": "rimraf@latest",
         "scope": null,
         "escapedName": "rimraf",
         "name": "rimraf",
-        "rawSpec": "2.6.0",
-        "spec": "2.6.0",
-        "type": "version"
+        "rawSpec": "latest",
+        "spec": "latest",
+        "type": "tag"
       },
-      "/Users/rebecca/code/npm"
+      "/Users/zkat/Documents/code/npm"
     ]
   ],
-  "_from": "rimraf@2.6.0",
-  "_id": "rimraf@2.6.0",
+  "_from": "rimraf@latest",
+  "_id": "rimraf@2.6.1",
   "_inCache": true,
   "_location": "/rimraf",
   "_nodeVersion": "8.0.0-pre",
   "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/rimraf-2.6.0.tgz_1487455299128_0.33092148951254785"
+    "host": "packages-18-east.internal.npmjs.com",
+    "tmp": "tmp/rimraf-2.6.1.tgz_1487908074285_0.8205490333493799"
   },
   "_npmUser": {
     "name": "isaacs",
@@ -29,28 +29,28 @@
   "_npmVersion": "4.3.0",
   "_phantomChildren": {},
   "_requested": {
-    "raw": "rimraf@2.6.0",
+    "raw": "rimraf@latest",
     "scope": null,
     "escapedName": "rimraf",
     "name": "rimraf",
-    "rawSpec": "2.6.0",
-    "spec": "2.6.0",
-    "type": "version"
+    "rawSpec": "latest",
+    "spec": "latest",
+    "type": "tag"
   },
   "_requiredBy": [
     "#USER",
     "/",
+    "/@npmcorp/move",
+    "/@npmcorp/move/@npmcorp/copy",
     "/fs-vacuum",
     "/fstream",
-    "/node-gyp",
-    "/standard/eslint/file-entry-cache/flat-cache/del",
-    "/tacks"
+    "/node-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.0.tgz",
-  "_shasum": "89b8a0fe432b9ff9ec9a925a00b6cdb3a91bbada",
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+  "_shasum": "c2338ec643df7a1b7fe5c54fa86f57428a55f33d",
   "_shrinkwrap": null,
-  "_spec": "rimraf@2.6.0",
-  "_where": "/Users/rebecca/code/npm",
+  "_spec": "rimraf@latest",
+  "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -72,8 +72,8 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "89b8a0fe432b9ff9ec9a925a00b6cdb3a91bbada",
-    "tarball": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.0.tgz"
+    "shasum": "c2338ec643df7a1b7fe5c54fa86f57428a55f33d",
+    "tarball": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
   },
   "files": [
     "LICENSE",
@@ -81,7 +81,7 @@
     "bin.js",
     "rimraf.js"
   ],
-  "gitHead": "5b661e45ff409d42251890cb1b993c9315803bbf",
+  "gitHead": "d84fe2cc6646d30a401baadcee22ae105a2d4909",
   "homepage": "https://github.com/isaacs/rimraf#readme",
   "license": "ISC",
   "main": "rimraf.js",
@@ -101,5 +101,5 @@
   "scripts": {
     "test": "tap test/*.js"
   },
-  "version": "2.6.0"
+  "version": "2.6.1"
 }
diff --git a/node_modules/rimraf/rimraf.js b/node_modules/rimraf/rimraf.js
index e63321938..c26331265 100644
--- a/node_modules/rimraf/rimraf.js
+++ b/node_modules/rimraf/rimraf.js
@@ -350,10 +350,13 @@ function rmkidsSync (p, options) {
   var retries = isWindows ? 100 : 1
   var i = 0
   do {
+    var threw = true
     try {
-      return options.rmdirSync(p, options)
+      var ret = options.rmdirSync(p, options)
+      threw = false
+      return ret
     } finally {
-      if (++i < retries)
+      if (++i < retries && threw)
         continue
     }
   } while (true)
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index ea3ccae5a..7c1e4a853 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1104,9 +1104,9 @@
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"
     },
     "rimraf": {
-      "version": "2.6.0",
-      "from": "rimraf@2.6.0",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.0.tgz"
+      "version": "2.6.1",
+      "from": "rimraf@latest",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
     },
     "semver": {
       "version": "5.3.0",
diff --git a/package.json b/package.json
index 2446c038d..00628d059 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "realize-package-specifier": "~3.0.3",
     "request": "~2.81.0",
     "retry": "~0.10.1",
-    "rimraf": "~2.6.0",
+    "rimraf": "~2.6.1",
     "semver": "~5.3.0",
     "sha": "~2.0.1",
     "slide": "~1.1.6",