print messages bug fix - info user license update

src/GamUpdate.txt

@@ -1,3 +1,24 @@
+7.32.05
+
+Fixed bug in `gam <UserTypeEntity> print messages|threads ... headers <SMTPHeaderList>` where
+headers other than those specified in `<SMTPHeaderList>` were displayed.
+
+Updated `gam info users <UserTypeEntity>` to display the following data when the Licensing API
+does not return data due to quota limits. Previously, no License data was displayed and
+there was no way to know if it was omitted due to API quota limits vs the user has no license?
+```
+  Licenses: (1)
+    Not available/incomplete
+```
+If a user has no licenses, this will be displayed.
+```
+  Licenses: (0)
+```
+
+You should use `license_skus = <SKUIDList>` in `gam.cfg` to list all of the licensing SKUs
+used in your workspace. Without this list, GAM has to make 70+ API calls to get the licenses
+for a user; this can cause quota limit errors.
+
 7.32.04
 
 Support for student groups in Google Classroom no longer requires Developer Preview membership.

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.32.04'
+__version__ = '7.32.05'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 # pylint: disable=wrong-import-position
@@ -46398,6 +46398,7 @@ def getUserLicenses(lic, user, skus):
     if sku_calls:
       if try_count >= 5:
         # give up and return what we have
+        licenses.append('Not available/incomplete')
         return licenses
       time.sleep(5)
   return licenses
@@ -47050,7 +47051,7 @@ def infoUsers(entityList):
           if max(seen_group_count.values()) > 1:
             printLine(f'{Ind.Spaces()}* {Msg.USER_HAS_MULTIPLE_DIRECT_OR_INHERITED_MEMBERSHIPS_IN_GROUP}')
           Ind.Decrement()
-      if licenses:
+      if getLicenses:
         printEntitiesCount(Ent.LICENSE, licenses)
         Ind.Increment()
         for u_license in licenses:
@@ -74818,7 +74819,10 @@ def printShowMessagesThreads(users, entityType):
       csvPF.SetTitles(sortTitles)
     else:
       sortTitles = ['User', 'threadId', 'id']
-      sortTitles.extend(defaultHeaders)
+      if show_all_headers:
+        sortTitles.extend(defaultHeaders)
+      elif headersToShow:
+        sortTitles.extend([SMTP_HEADERS_MAP.get(header, header) for header in headersToShow])
       if show_size:
         sortTitles.append('SizeEstimate')
       if show_labels: