[ARVADOS] updated: 8a8450dcb4dfa4fa222e059091bae03c5e45df3f

[git at public.curoverse.com]

Summary of changes:
 services/fuse/arvados_fuse/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  8a8450dcb4dfa4fa222e059091bae03c5e45df3f (commit)
      from  7939a927a2b0584210d5e8b2fe73f7625858d6bd (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 8a8450dcb4dfa4fa222e059091bae03c5e45df3f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Feb 6 13:34:43 2015 -0500

    3021: Bugfix for arvados_fuse.TagsDirectory to correctly merge tag list updates
    with existing TagsDirectory entries.

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index b68574c..73a609c 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -480,8 +480,8 @@ class TagsDirectory(RecursiveInvalidateDirectory):
                 ).execute(num_retries=self.num_retries)
         if "items" in tags:
             self.merge(tags['items'],
-                       lambda i: i['name'] if 'name' in i else i['uuid'],
-                       lambda a, i: a.tag == i,
+                       lambda i: i['name'],
+                       lambda a, i: a.tag == i['name'],
                        lambda i: TagDirectory(self.inode, self.inodes, self.api, self.num_retries, i['name'], poll=self._poll, poll_time=self._poll_time))
 
 

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


hooks/post-receive
--