Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk

[arvados.git] / services / fuse / arvados_fuse / fusedir.py

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index 12c02e2c5d88278b52dbc41d3d300a302c72b2c7..becd66975f676a76b09eb8da6761582fd2e94b5e 100644 (file)
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -194,7 +194,6 @@ class Directory(FreshBase):
         # Calling the public items() method might trigger a refresh,
         # which we definitely don't want, so read the internal dict directly.
         for k,v in parent._entries.items():
-            _logger.debug("looking at %s %s, self is %s", k, v, self)
             if v is self:
                 self.inodes.invalidate_entry(parent, k)
                 break
@@ -995,13 +994,12 @@ class ProjectDirectory(Directory):
             # Was moved to somewhere else, so don't try to add entry
             new_name = None
 
-        if ev.get("object_kind") == "arvados#collection":
-            if old_attrs.get("is_trashed"):
-                # Was previously deleted
-                old_name = None
-            if new_attrs.get("is_trashed"):
-                # Has been deleted
-                new_name = None
+        if old_attrs.get("is_trashed"):
+            # Was previously deleted
+            old_name = None
+        if new_attrs.get("is_trashed"):
+            # Has been deleted
+            new_name = None
 
         if new_name != old_name:
             ent = None