From 904292ded3fa4f66bb79569365a596b11c00de4f Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Tue, 29 Jul 2025 17:54:45 -0700
Subject: [PATCH] Fixed bug in `gam <UserTypeEntity> show webmastersites` that
 caused a trap.

---
 src/GamUpdate.txt   |  4 ++++
 src/gam/__init__.py | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index ea603980..db1329f7 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -1,3 +1,7 @@
+7.17.01
+
+Fixed bug in `gam <UserTypeEntity> show webmastersites` that caused a trap.
+
 7.17.00
 
 Added commands to discover Sites and WebResources that managed users (previously unmanaged) may have access to for better governance and visibility.
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 38164864..1513593e 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 <google-apps-manager@googlegroups.com>'
-__version__ = '7.17.00'
+__version__ = '7.17.01'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -46963,8 +46963,8 @@ def doCreateSiteVerification():
   printKeyValueList(['Meta HTML Header Data', webserver_meta_record['token']])
   printBlankLine()
 
-def _showSiteVerificationInfo(site):
-  printKeyValueList(['Site', site['site']['identifier']])
+def _showSiteVerificationInfo(site, i=0, count=0):
+  printKeyValueListWithCount(['Site', site['site']['identifier']], i, count)
   Ind.Increment()
   printKeyValueList(['ID', unquote(site['id'])])
   printKeyValueList(['Type', site['site']['type']])
@@ -47072,8 +47072,11 @@ def doInfoSiteVerification():
   checkForExtraneousArguments()
   sites = callGAPIitems(verif.webResource(), 'list', 'items')
   if sites:
+    count = len(sites)
+    i = 0
     for site in sorted(sites, key=lambda k: (k['site']['type'], k['site']['identifier'])):
-      _showSiteVerificationInfo(site)
+      i += 1
+      _showSiteVerificationInfo(site, i, count)
   else:
     printKeyValueList(['No Sites Verified.'])
 
@@ -47101,7 +47104,7 @@ def printShowWebResources(users):
       j = 0
       for site in sorted(sites, key=lambda k: (k['site']['type'], k['site']['identifier'])):
         j += 1
-        _showSiteVerificationInfo(site)
+        _showSiteVerificationInfo(site, j, jcount)
       Ind.Decrement()
     else:
       for site in sites:
@@ -47134,7 +47137,10 @@ def printShowWebMasterSites(users):
       j = 0
       for site in sorted(sites, key=lambda k: k['siteUrl']):
         j += 1
-        _showSiteVerificationInfo(site)
+        printKeyValueListWithCount(['Site', site['siteUrl']], j, jcount)
+        Ind.Increment()
+        printKeyValueList(['permissionLevel', site['permissionLevel']])
+        Ind.Decrement()
       Ind.Decrement()
     else:
       for site in sites: