[ARVADOS] updated: f872322df04524d52893f89874f93adec90c2fa7

[git at public.curoverse.com]

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

       via  f872322df04524d52893f89874f93adec90c2fa7 (commit)
      from  96040562743f6056c2b243db16b5a83244894bd8 (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 f872322df04524d52893f89874f93adec90c2fa7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 26 12:58:51 2014 -0400

    fuse test fixes

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 6e2bf28..ad3d8e7 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -256,10 +256,11 @@ class TagsDirectory(Directory):
 
     def update(self):
         tags = self.api.links().list(filters=[['link_class', '=', 'tag']], select=['name'], distinct = True).execute()
-        self.merge(tags['items'],
-                   lambda i: i['name'],
-                   lambda a, i: a.tag == i,
-                   lambda i: TagDirectory(self.inode, self.inodes, self.api, i['name'], poll=self._poll, poll_time=self._poll_time))
+        if "items" in tags:
+            self.merge(tags['items'],
+                       lambda i: i['name'],
+                       lambda a, i: a.tag == i,
+                       lambda i: TagDirectory(self.inode, self.inodes, self.api, i['name'], poll=self._poll, poll_time=self._poll_time))
 
 class TagDirectory(Directory):
     '''A special directory that contains as subdirectories all collections visible
@@ -416,7 +417,7 @@ class Operations(llfuse.Operations):
     so request handlers do not run concurrently unless the lock is explicitly released
     with llfuse.lock_released.'''
 
-    def __init__(self, uid, gid, debug):
+    def __init__(self, uid, gid, debug=False):
         super(Operations, self).__init__()
 
         if debug:

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


hooks/post-receive
--