-
Notifications
You must be signed in to change notification settings - Fork 473
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed bug in
gam print group-members ... cachememberinfo
that cause…
…d a trap.
- Loading branch information
Showing
7 changed files
with
31 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -251,7 +251,7 @@ writes the credentials into the file oauth2.txt. | |
admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt | ||
admin@server:/Users/admin$ gam version | ||
WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found | ||
GAM 7.00.32 - https://github.com/GAM-team/GAM - pyinstaller | ||
GAM 7.00.33 - https://github.com/GAM-team/GAM - pyinstaller | ||
GAM Team <[email protected]> | ||
Python 3.13.0 64-bit final | ||
MacOS Sonoma 14.5 x86_64 | ||
|
@@ -923,7 +923,7 @@ writes the credentials into the file oauth2.txt. | |
C:\>del C:\GAMConfig\oauth2.txt | ||
C:\>gam version | ||
WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found | ||
GAM7 7.00.32 - https://github.com/GAM-team/GAM - pythonsource | ||
GAM7 7.00.33 - https://github.com/GAM-team/GAM - pythonsource | ||
GAM Team <[email protected]> | ||
Python 3.13.0 64-bit final | ||
Windows-10-10.0.17134 AMD64 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
Print the current version of Gam with details | ||
``` | ||
gam version | ||
GAM 7.00.32 - https://github.com/GAM-team/GAM - pyinstaller | ||
GAM 7.00.33 - https://github.com/GAM-team/GAM - pyinstaller | ||
GAM Team <[email protected]> | ||
Python 3.13.0 64-bit final | ||
MacOS Sonoma 14.5 x86_64 | ||
|
@@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 | |
Print the current version of Gam with details and time offset information | ||
``` | ||
gam version timeoffset | ||
GAM 7.00.32 - https://github.com/GAM-team/GAM - pyinstaller | ||
GAM 7.00.33 - https://github.com/GAM-team/GAM - pyinstaller | ||
GAM Team <[email protected]> | ||
Python 3.13.0 64-bit final | ||
MacOS Sonoma 14.5 x86_64 | ||
|
@@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second | |
Print the current version of Gam with extended details and SSL information | ||
``` | ||
gam version extended | ||
GAM 7.00.32 - https://github.com/GAM-team/GAM - pyinstaller | ||
GAM 7.00.33 - https://github.com/GAM-team/GAM - pyinstaller | ||
GAM Team <[email protected]> | ||
Python 3.13.0 64-bit final | ||
MacOS Sonoma 14.5 x86_64 | ||
|
@@ -64,15 +64,15 @@ MacOS High Sierra 10.13.6 x86_64 | |
Path: /Users/Admin/bin/gam7 | ||
Version Check: | ||
Current: 5.35.08 | ||
Latest: 7.00.32 | ||
Latest: 7.00.33 | ||
echo $? | ||
1 | ||
``` | ||
|
||
Print the current version number without details | ||
``` | ||
gam version simple | ||
7.00.32 | ||
7.00.33 | ||
``` | ||
In Linux/MacOS you can do: | ||
``` | ||
|
@@ -82,7 +82,7 @@ echo $VER | |
Print the current version of Gam and address of this Wiki | ||
``` | ||
gam help | ||
GAM 7.00.32 - https://github.com/GAM-team/GAM | ||
GAM 7.00.33 - https://github.com/GAM-team/GAM | ||
GAM Team <[email protected]> | ||
Python 3.13.0 64-bit final | ||
MacOS Sonoma 14.5 x86_64 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,7 @@ | |
""" | ||
|
||
__author__ = 'GAM Team <[email protected]>' | ||
__version__ = '7.00.32' | ||
__version__ = '7.00.33' | ||
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' | ||
|
||
#pylint: disable=wrong-import-position | ||
|
@@ -33844,7 +33844,7 @@ def getNameFromPeople(memberId): | |
if userFieldsList: | ||
if not memberOptions[MEMBEROPTION_MEMBERNAMES] and 'name.fullName' in userFieldsList: | ||
memberOptions[MEMBEROPTION_MEMBERNAMES] = True | ||
if memberOptions[MEMBEROPTION_MEMBERNAMES]: | ||
if memberOptions[MEMBEROPTION_MEMBERNAMES] or cacheMemberInfo: | ||
if 'name.fullName' not in userFieldsList: | ||
userFieldsList.append('name.fullName') | ||
csvPF.AddTitles('name') | ||
|
@@ -33906,12 +33906,13 @@ def getNameFromPeople(memberId): | |
retryReasons=GAPI.SERVICE_NOT_AVAILABLE_RETRY_REASONS, | ||
userKey=memberId, projection=schemaParms['projection'], customFieldMask=schemaParms['customFieldMask'], | ||
fields=userFields) | ||
mname = mbinfo['name'].pop('fullName') | ||
if memberOptions[MEMBEROPTION_MEMBERNAMES]: | ||
row['name'] = mbinfo['name'].pop('fullName') | ||
row['name'] = mname | ||
if not mbinfo['name']: | ||
mbinfo.pop('name') | ||
if cacheMemberInfo: | ||
memberNames[memberId] = row['name'] | ||
memberNames[memberId] = mname | ||
if mbinfo: | ||
memberInfo[memberId] = mbinfo | ||
else: | ||
|