fix emptydirs

Author: oesteban

nipype/pipeline/engine/nodes.py

@@ -395,7 +395,7 @@ def run(self, updatehash=False):
             self._interface.can_resume and op.isfile(hashfile_unfinished))
 
         if rm_outdir:
-            emptydirs(outdir)
+            emptydirs(outdir, noexist_ok=True)
         else:
             logger.debug('[%sNode] Resume - hashfile=%s',
                          'Map' * int(isinstance(self, MapNode)),

nipype/utils/filemanip.py

@@ -699,18 +699,22 @@ def makedirs(path, exist_ok=False):
     return path
 
 
-def emptydirs(path):
+def emptydirs(path, noexist_ok=False):
     """
-    Empty an existing directory, without deleting it
+    Empty an existing directory, without deleting it. Do not
+    raise error if the path does not exist and noexist_ok is True.
 
     Parameters
     ----------
     path : directory that should be empty
 
     """
     fmlogger.debug("Removing contents of %s", path)
-    pathconts = os.listdir(path)
 
+    if noexist_ok and not os.path.exists(path):
+        return True
+
+    pathconts = os.listdir(path)
     if not pathconts:
         return True