[ARVADOS] updated: 2.1.0-1646-g8a33f7899

[Git user]

Summary of changes:
 doc/admin/upgrading.html.textile.liquid        | 2 +-
 services/api/app/controllers/sys_controller.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  8a33f7899da36343e687febb63678d90e83b7d63 (commit)
       via  a2d44a516ca802e3b648313e8de268ddc1492341 (commit)
      from  eafbd28d0a866807471951e133a8132dbdfa9cfc (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 8a33f7899da36343e687febb63678d90e83b7d63
Author: Tom Clegg <tom at curii.com>
Date:   Thu Nov 18 11:52:01 2021 -0500

    18339: Clarify consequences of delete-role bug.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 59d41e6c2..a39499bab 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -41,7 +41,7 @@ h2(#main). development main (as of 2021-11-10)
 
 h3. Previously trashed role groups will be deleted
 
-A bug in previous versions caused role groups to be flagged as trash instead of being deleted by a @DELETE@ operation. After upgrading, any groups that had been trashed this way will be deleted, and future @DELETE@ operations will delete role groups as intended.
+Due to a bug in previous versions, the @DELETE@ operation on a role group caused the group to be flagged as trash in the database, but continue to grant permissions regardless. After upgrading, any role groups that had been trashed this way will be deleted. This might surprise some users if they were relying on permissions that were still in effect due to this bug. Future @DELETE@ operations on a role group will delete the group immediately.
 
 h3. Users are visible to other users by default
 

commit a2d44a516ca802e3b648313e8de268ddc1492341
Author: Tom Clegg <tom at curii.com>
Date:   Thu Nov 18 11:50:58 2021 -0500

    18339: Fix scheduled deletion of non-project group.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/api/app/controllers/sys_controller.rb b/services/api/app/controllers/sys_controller.rb
index 3d434f2d6..a67b124bd 100644
--- a/services/api/app/controllers/sys_controller.rb
+++ b/services/api/app/controllers/sys_controller.rb
@@ -38,8 +38,8 @@ class SysController < ApplicationController
 
   def delete_project_and_contents(p_uuid)
     p = Group.find_by_uuid(p_uuid)
-    if !p || p.group_class != 'project'
-      raise "can't sweep group '#{p_uuid}', it may not exist or not be a project"
+    if !p
+      raise "can't sweep group '#{p_uuid}', it may not exist"
     end
     # First delete sub projects
     Group.where({group_class: 'project', owner_uuid: p_uuid}).each do |sub_project|

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


hooks/post-receive
--