projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10236-disable-event-listening'
[arvados.git]
/
services
/
fuse
/
arvados_fuse
/
fusefile.py
diff --git
a/services/fuse/arvados_fuse/fusefile.py
b/services/fuse/arvados_fuse/fusefile.py
index e731327dec5524432d0eb12c7d9dfc2b900fafd4..81fcd405ad051f50e5d7e88e048f02895d0e7323 100644
(file)
--- a/
services/fuse/arvados_fuse/fusefile.py
+++ b/
services/fuse/arvados_fuse/fusefile.py
@@
-29,8
+29,8
@@
class File(FreshBase):
def mtime(self):
return self._mtime
def mtime(self):
return self._mtime
- def clear(self
, force=False
):
- return True
+ def clear(self):
+ pass
def writable(self):
return False
def writable(self):
return False
@@
-95,6
+95,12
@@
class ObjectFile(StringFile):
return self.object_uuid
def update(self, obj=None):
return self.object_uuid
def update(self, obj=None):
+ if obj is None:
+ # TODO: retrieve the current record for self.object_uuid
+ # from the server. For now, at least don't crash when
+ # someone tells us it's a good time to update but doesn't
+ # pass us a fresh obj. See #8345
+ return
self._mtime = convertTime(obj['modified_at']) if 'modified_at' in obj else 0
self.contents = json.dumps(obj, indent=4, sort_keys=True) + "\n"
self._mtime = convertTime(obj['modified_at']) if 'modified_at' in obj else 0
self.contents = json.dumps(obj, indent=4, sort_keys=True) + "\n"