[ARVADOS] updated: 3e50cdc0ff3c5c8d40d082bf99a43eae3682aa72

[Git user]

Summary of changes:
 services/fuse/arvados_fuse/fusefile.py | 6 ++++++
 1 file changed, 6 insertions(+)

       via  3e50cdc0ff3c5c8d40d082bf99a43eae3682aa72 (commit)
       via  354ab6f297bb2100b6ebd0c94fa6463a77d18844 (commit)
      from  9df4d7da24ef8be639af1ab806cf833ee544fb45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3e50cdc0ff3c5c8d40d082bf99a43eae3682aa72
Merge: 9df4d7d 354ab6f
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 22 12:09:27 2016 -0400

    Merge branch '8747-fix-crash-on-update'
    
    refs #8747


commit 354ab6f297bb2100b6ebd0c94fa6463a77d18844
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Mar 10 15:25:41 2016 -0500

    8345: Do not crash when update() called without an obj.

diff --git a/services/fuse/arvados_fuse/fusefile.py b/services/fuse/arvados_fuse/fusefile.py
index e731327..3f0e493 100644
--- a/services/fuse/arvados_fuse/fusefile.py
+++ b/services/fuse/arvados_fuse/fusefile.py
@@ -95,6 +95,12 @@ class ObjectFile(StringFile):
         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"
 

-----------------------------------------------------------------------


hooks/post-receive
--