1 files changed, 34 insertions, 36 deletions

diff --git a/deps/npm/node_modules/fs-vacuum/vacuum.js b/deps/npm/node_modules/fs-vacuum/vacuum.js
index e55abe9701b..1fb674da96e 100644
--- a/deps/npm/node_modules/fs-vacuum/vacuum.js
+++ b/deps/npm/node_modules/fs-vacuum/vacuum.js
@@ -1,108 +1,106 @@
-var assert   = require("assert")
-var dirname  = require("path").dirname
-var resolve  = require("path").resolve
-var isInside = require("path-is-inside")
+var assert = require('assert')
+var dirname = require('path').dirname
+var resolve = require('path').resolve
+var isInside = require('path-is-inside')
 
-var rimraf  = require("rimraf")
-var lstat   = require("graceful-fs").lstat
-var readdir = require("graceful-fs").readdir
-var rmdir   = require("graceful-fs").rmdir
-var unlink  = require("graceful-fs").unlink
+var rimraf = require('rimraf')
+var lstat = require('graceful-fs').lstat
+var readdir = require('graceful-fs').readdir
+var rmdir = require('graceful-fs').rmdir
+var unlink = require('graceful-fs').unlink
 
 module.exports = vacuum
 
-function vacuum(leaf, options, cb) {
-  assert(typeof leaf === "string", "must pass in path to remove")
-  assert(typeof cb === "function", "must pass in callback")
+function vacuum (leaf, options, cb) {
+  assert(typeof leaf === 'string', 'must pass in path to remove')
+  assert(typeof cb === 'function', 'must pass in callback')
 
   if (!options) options = {}
-  assert(typeof options === "object", "options must be an object")
+  assert(typeof options === 'object', 'options must be an object')
 
   var log = options.log ? options.log : function () {}
 
   leaf = leaf && resolve(leaf)
   var base = options.base && resolve(options.base)
   if (base && !isInside(leaf, base)) {
-    return cb(new Error(leaf + " is not a child of " + base))
+    return cb(new Error(leaf + ' is not a child of ' + base))
   }
 
   lstat(leaf, function (error, stat) {
     if (error) {
-      if (error.code === "ENOENT") return cb(null)
+      if (error.code === 'ENOENT') return cb(null)
 
       log(error.stack)
       return cb(error)
     }
 
     if (!(stat && (stat.isDirectory() || stat.isSymbolicLink() || stat.isFile()))) {
-      log(leaf, "is not a directory, file, or link")
-      return cb(new Error(leaf + " is not a directory, file, or link"))
+      log(leaf, 'is not a directory, file, or link')
+      return cb(new Error(leaf + ' is not a directory, file, or link'))
     }
 
     if (options.purge) {
-      log("purging", leaf)
+      log('purging', leaf)
       rimraf(leaf, function (error) {
         if (error) return cb(error)
 
         next(dirname(leaf))
       })
-    }
-    else if (!stat.isDirectory()) {
-      log("removing", leaf)
+    } else if (!stat.isDirectory()) {
+      log('removing', leaf)
       unlink(leaf, function (error) {
         if (error) return cb(error)
 
         next(dirname(leaf))
       })
-    }
-    else {
+    } else {
       next(leaf)
     }
   })
 
-  function next(branch) {
+  function next (branch) {
     branch = branch && resolve(branch)
     // either we've reached the base or we've reached the root
     if ((base && branch === base) || branch === dirname(branch)) {
-      log("finished vacuuming up to", branch)
+      log('finished vacuuming up to', branch)
       return cb(null)
     }
 
     readdir(branch, function (error, files) {
       if (error) {
-        if (error.code === "ENOENT") return cb(null)
+        if (error.code === 'ENOENT') return cb(null)
 
-        log("unable to check directory", branch, "due to", error.message)
+        log('unable to check directory', branch, 'due to', error.message)
         return cb(error)
       }
 
       if (files.length > 0) {
-        log("quitting because other entries in", branch)
+        log('quitting because other entries in', branch)
         return cb(null)
       }
 
-      log("removing", branch)
+      log('removing', branch)
       lstat(branch, function (error, stat) {
         if (error) {
-          if (error.code === "ENOENT") return cb(null)
+          if (error.code === 'ENOENT') return cb(null)
 
-          log("unable to lstat", branch, "due to", error.message)
+          log('unable to lstat', branch, 'due to', error.message)
           return cb(error)
         }
 
         var remove = stat.isDirectory() ? rmdir : unlink
         remove(branch, function (error) {
           if (error) {
-            if (error.code === "ENOENT") {
-              log("quitting because lost the race to remove", branch)
+            if (error.code === 'ENOENT') {
+              log('quitting because lost the race to remove', branch)
               return cb(null)
             }
-            if (error.code === "ENOTEMPTY") {
-              log("quitting because new (racy) entries in", branch)
+            if (error.code === 'ENOTEMPTY' || error.code === 'EEXIST') {
+              log('quitting because new (racy) entries in', branch)
               return cb(null)
             }
 
-            log("unable to remove", branch, "due to", error.message)
+            log('unable to remove', branch, 'due to', error.message)
             return cb(error)
           }