[ARVADOS] updated: 2.1.0-445-g13bddf159

[Git user]

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

  discards  ffdbd02c74f7770a9d5b15ebde3ee56d3a11d8c2 (commit)
       via  13bddf159a9f39c5d81b5d68402ae8c2f76d0cdb (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (ffdbd02c74f7770a9d5b15ebde3ee56d3a11d8c2)
            \
             N -- N -- N (13bddf159a9f39c5d81b5d68402ae8c2f76d0cdb)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 13bddf159a9f39c5d81b5d68402ae8c2f76d0cdb
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..1fab2e0fb 100644
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -894,14 +894,16 @@ 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().contents,
                                                  self.num_retries,
-                                                 filters=[["owner_uuid", "=", self.project_uuid],
+                                                 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().contents,
                                                       self.num_retries,
-                                                      filters=[["owner_uuid", "=", self.project_uuid]]))
+                                                      uuid=self.project_uuid,
+                                                      filters=[["uuid", "is_a", "arvados#collection"]]))
 
             # end with llfuse.lock_released, re-acquire lock
 

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


hooks/post-receive
--