From fe4268230e9e39040336bb9a2e80ade433a26d46 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Fri, 18 Jul 2025 14:14:09 -0700 Subject: [PATCH] Fixed bug in `gam print cigroup-members includederivedmembership` that caused a trap. --- src/GamUpdate.txt | 4 ++++ src/gam/__init__.py | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 17c57e63..4682ca7a 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,7 @@ +7.14.03 + +Fixed bug in `gam print cigroup-members includederivedmembership` that caused a trap. + 7.14.02 Fixed bug in `gam print|show cigroups|cigroups-members cimember ` that generated the following error: diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 3d909160..a63c3b20 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki """ __author__ = 'GAM Team ' -__version__ = '7.14.02' +__version__ = '7.14.03' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' #pylint: disable=wrong-import-position @@ -6011,7 +6011,11 @@ def getCIGroupMemberRoleFixType(member): def getCIGroupTransitiveMemberRoleFixType(groupName, tmember): ''' map transitive member to normal member ''' tid = tmember['preferredMemberKey'][0].get('id', GC.Values[GC.CUSTOMER_ID]) if tmember['preferredMemberKey'] else '' - ttype, tname = tmember['member'].split('/') + if '/' in tmember['member']: + ttype, tname = tmember['member'].split('/') + else: + ttype = '' + tname = tmember['member'] member = {'name': f'{groupName}/membershipd/{tname}', 'preferredMemberKey': {'id': tid}} if 'type' not in tmember: if tid == GC.Values[GC.CUSTOMER_ID]: