[ARVADOS] updated: 2.1.0-445-gffdbd02c7
Git user
git at public.arvados.org
Thu Feb 25 16:46:49 UTC 2021
Summary of changes:
services/fuse/arvados_fuse/fusedir.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
via ffdbd02c74f7770a9d5b15ebde3ee56d3a11d8c2 (commit)
from da67aa964aef9ec724e02594140d61d6d3b8222b (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 ffdbd02c74f7770a9d5b15ebde3ee56d3a11d8c2
Author: Ward Vandewege <ward at curii.com>
Date: Thu Feb 25 11:45:35 2021 -0500
17119: make arvados_fuse.fusedir.ProjectDirectory use the group contents endpoint.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index db5020cfe..18e33d233 100644
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -894,14 +894,14 @@ class ProjectDirectory(Directory):
elif user_uuid_pattern.match(self.project_uuid):
self.project_object = self.api.users().get(
uuid=self.project_uuid).execute(num_retries=self.num_retries)
-
- contents = arvados.util.list_all(self.api.groups().list,
+ # do this in 2 steps until #17424 is fixed
+ contents = arvados.util.list_all(self.api.groups(self.project_uuid).contents,
self.num_retries,
- filters=[["owner_uuid", "=", self.project_uuid],
+ filters=[["uuid", "is_a", "arvados#group"],
["group_class", "=", "project"]])
- contents.extend(arvados.util.list_all(self.api.collections().list,
+ contents.extend(arvados.util.list_all(self.api.groups(self.project_uuid).contents,
self.num_retries,
- filters=[["owner_uuid", "=", self.project_uuid]]))
+ filters=[["uuid", "is_a", "arvados#collection"]]))
# end with llfuse.lock_released, re-acquire lock
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list