Fix to unlink directories without an object on S3.

danilop · Jun 18, 2014 · f2a18c4 · f2a18c4
1 parent 8ae54e5
commit f2a18c4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/yas3fs/__init__.py b/yas3fs/__init__.py
@@ -1830,8 +1830,8 @@ def rmdir(self, path):
                 logger.debug("rmdir '%s' cache ENOENT" % (path))
                 raise FuseOSError(errno.ENOENT)
             k = self.get_key(path)
-            if not k and not self.folder_has_contents(path):
-                logger.debug("rmdir '%s' key ENOENT" % (path))
+            if not k and not self.cache.has(path) and not self.folder_has_contents(path):
+                logger.debug("rmdir '%s' S3 ENOENT" % (path))
                 raise FuseOSError(errno.ENOENT)
             dirs = self.cache.get(path, 'readdir')
             if dirs == None: