[arvados] updated: 2.7.0-5391-g2c0bf8219e

[git repository hosting]

Summary of changes:
 lib/controller/federation/conn.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  2c0bf8219eb3ff5f978d147bff7ae6c6a73e8188 (commit)
      from  0b0a1bec011d8fb19205f53d78848fee800f2d88 (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 2c0bf8219eb3ff5f978d147bff7ae6c6a73e8188
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Nov 27 11:26:07 2023 -0500

    20831: Remove debug print and add error check
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index bd5a6d812e..75b9f2136b 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -705,7 +705,6 @@ func (conn *Conn) batchUpdateUsers(ctx context.Context,
 			delete(updates, "is_admin")
 			delete(updates, "is_invited")
 		}
-		fmt.Printf("updates %v", updates)
 		batchOpts.Updates[user.UUID] = updates
 	}
 	if len(batchOpts.Updates) > 0 {
@@ -725,6 +724,10 @@ func (conn *Conn) includeAdminAndInvitedInBatchUpdate(ctx context.Context, be ba
 	// fields aren't actually valid then we don't want to
 	// send them in the batch update.
 	dd, err := be.DiscoveryDocument(ctx)
+	if err != nil {
+		// couldn't get discovery document
+		return false, err
+	}
 	if dd.Revision >= "20231117" {
 		// newer version, fields are valid.
 		return true, nil

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


hooks/post-receive
--