From 6126e6ac67226a37e8eecb9cf38adeb362a8f5b0 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Wed, 7 Feb 2024 12:18:08 -0800 Subject: [PATCH] Fixed `` bug for real. --- docs/GamUpdates.md | 6 +++++- docs/How-to-Upgrade-from-Standard-GAM.md | 4 ++-- docs/Version-and-Help.md | 12 ++++++------ src/GamUpdate.txt | 4 ++++ src/gam/__init__.py | 6 ++++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index f0e737e8..27ca2ca0 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -11,9 +11,13 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads](https://github.com/taers232c/GAMADV-XTD3/wiki/Downloads) for Windows or other options, including manual installation +### 6.68.01 + +Fixed `` bug for real. + ### 6.68.00 -Fixed bug introduced in 6.67.35 that caused a command error like the following or would +Fixed `` bug introduced in 6.67.35 that caused a command error like the following or would not properly match `type|nottype ` and `role|notrole `. ``` diff --git a/docs/How-to-Upgrade-from-Standard-GAM.md b/docs/How-to-Upgrade-from-Standard-GAM.md index df58b69d..e72d03b3 100644 --- a/docs/How-to-Upgrade-from-Standard-GAM.md +++ b/docs/How-to-Upgrade-from-Standard-GAM.md @@ -334,7 +334,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin/bin/gamadv-xtd3$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin/bin/gamadv-xtd3$ ./gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAMADV-XTD3 6.68.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.1 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -1002,7 +1002,7 @@ writes the credentials into the file oauth2.txt. C:\GAMADV-XTD3>del C:\GAMConfig\oauth2.txt C:\GAMADV-XTD3>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAMADV-XTD3 6.68.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.1 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 6d902bbd..adb5e7e6 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAMADV-XTD3 6.68.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.1 64-bit final MacOS Sonoma 14.2.1 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 -GAMADV-XTD3 6.68.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.1 64-bit final MacOS Sonoma 14.2.1 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 -GAMADV-XTD3 6.68.00 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource +GAMADV-XTD3 6.68.01 - https://github.com/taers232c/GAMADV-XTD3 - pythonsource Ross Scroggs Python 3.12.1 64-bit final MacOS Sonoma 14.2.1 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gamadv-xtd3 Version Check: Current: 5.35.08 - Latest: 6.68.00 + Latest: 6.68.01 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -6.68.00 +6.68.01 ``` 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 6.68.00 - https://github.com/taers232c/GAMADV-XTD3 +GAM 6.68.01 - https://github.com/taers232c/GAMADV-XTD3 Ross Scroggs Python 3.12.1 64-bit final MacOS Sonoma 14.2.1 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index b7e461da..d91f2a00 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -2,6 +2,10 @@ Merged GAM-Team version +6.68.01 + +Fixed `` bug for real. + 6.68.00 Fixed `` bug introduced in 6.67.35 that caused a command error like the following or would diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 755e20f9..660b739e 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -52570,7 +52570,8 @@ class PermissionMatch(): while Cmd.ArgumentsRemaining(): myarg = getArgument() if myarg in {'type', 'nottype'}: - body[myarg] = set(getChoice(DRIVEFILE_ACL_PERMISSION_TYPES)) + body[myarg] = set() + body[myarg].add(getChoice(DRIVEFILE_ACL_PERMISSION_TYPES)) self.permissionFields.add('type') elif myarg in {'typelist', 'nottypelist'}: arg = 'type' if myarg == 'typelist' else 'nottype' @@ -52583,7 +52584,8 @@ class PermissionMatch(): self.permissionFields.add('type') elif myarg in {'role', 'notrole'}: roleLocation = Cmd.Location() - body[myarg] = set(getChoice(DRIVEFILE_ACL_ROLES_MAP, mapChoice=True)) + body[myarg] = set() + body[myarg].add(getChoice(DRIVEFILE_ACL_ROLES_MAP, mapChoice=True)) self.permissionFields.add('role') elif myarg in {'rolelist', 'notrolelist'}: arg = 'role' if myarg == 'rolelist' else 'notrole'