diff --git a/src/GamCommands.txt b/src/GamCommands.txt index 7b4c8ecf..a2cd9396 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -4549,11 +4549,12 @@ gam report usage customer [todrive *] chrome| classroom| contextawareaccess| - gplus|currents|google+| datastudio| drive|doc|docs| gcp|cloud| geminiinworkspaceapps|gemini|geminiforworkspace| + gmail| + gplus|currents|google+| groups|group| groupsenterprise|enterprisegroups| jamboard| diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 20d080f2..fb68e030 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,11 @@ +7.19.01 + +Updated `gam print|show signature` to handle the following error +that occurs when an alias is specified. +``` +ERROR: 404: notFound - Requested entity was not found. +``` + 7.19.00 Eliminated `drive_v3_beta` and `meet_v2_beta` from `gam.cfg` as the API betas are no longer used. diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 3bd16f15..dd4346ae 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.19.00' +__version__ = '7.19.01' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' #pylint: disable=wrong-import-position @@ -74689,7 +74689,7 @@ def printShowSignature(users): try: if selection is None: sendas = callGAPI(gmail.users().settings().sendAs(), 'get', - throwReasons=GAPI.GMAIL_THROW_REASONS, + throwReasons=GAPI.GMAIL_THROW_REASONS+[GAPI.NOT_FOUND], userId='me', sendAsEmail=user) else: results = callGAPIitems(gmail.users().settings().sendAs(), 'list', 'sendAs', @@ -74718,6 +74718,8 @@ def printShowSignature(users): if field in sendas[item]: row[f'smtpMsa{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{field}'] = sendas[item][field] csvPF.WriteRowTitles(row) + except GAPI.notFound as e: + entityActionFailedWarning([Ent.USER, user], str(e), i, count) except GAPI.serviceNotAvailable: userGmailServiceNotEnabledWarning(user, i, count) if csvPF: