deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Upgraded to OpenSSL 3.5.0.

Browse Source
This commit is contained in:
Ross Scroggs
2025-04-08 09:58:25 -07:00
parent 2bf9c7b0d4
commit c460c48289
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/GamUpdate.txt
View File

@@ -1,3 +1,10 @@
7.06.00
Upgraded to OpenSSL 3.5.0.
Fixed bug in `gam print cigroups` where `createTime`, `updateTime` and `statusTime`
were not converted according to `gam.cfg timezone`.
7.05.22 7.05.22
Updated progress messages for `gam <UserTypeEntity> print filelist|filecounts|filesharecounts|filetree select shareddriveid <SharedDriveID>` Updated progress messages for `gam <UserTypeEntity> print filelist|filecounts|filesharecounts|filetree select shareddriveid <SharedDriveID>`

10
src/gam/__init__.py
View File

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
""" """
__author__ = 'GAM Team <google-apps-manager@googlegroups.com>' __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
__version__ = '7.05.22' __version__ = '7.06.00'
__license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
#pylint: disable=wrong-import-position #pylint: disable=wrong-import-position
@@ -33563,14 +33563,14 @@ def doPrintGroups():
groupSettings.pop(key) groupSettings.pop(key)
if FJQC.formatJSON: if FJQC.formatJSON:
row['email'] = groupEntity['email'] row['email'] = groupEntity['email']
row['JSON'] = json.dumps(groupEntity, ensure_ascii=False, sort_keys=True) row['JSON'] = json.dumps(cleanJSON(groupEntity), ensure_ascii=False, sort_keys=True)
if rolesSet and groupMembers is not None: if rolesSet and groupMembers is not None:
row['JSON-members'] = json.dumps(groupMembers, ensure_ascii=False, sort_keys=True) row['JSON-members'] = json.dumps(groupMembers, ensure_ascii=False, sort_keys=True)
if isinstance(groupSettings, dict): if isinstance(groupSettings, dict):
row['JSON-settings'] = json.dumps(groupSettings, ensure_ascii=False, sort_keys=True) row['JSON-settings'] = json.dumps(cleanJSON(groupSettings), ensure_ascii=False, sort_keys=True)
groupCloudIdentity = ciGroups.get(row['email'], {}) groupCloudIdentity = ciGroups.get(row['email'], {})
if groupCloudIdentity: if groupCloudIdentity:
row['JSON-cloudIdentity'] = json.dumps(groupCloudIdentity, ensure_ascii=False, sort_keys=True) row['JSON-cloudIdentity'] = json.dumps(cleanJSON(groupCloudIdentity, timeObjects=CIGROUP_TIME_OBJECTS), ensure_ascii=False, sort_keys=True)
csvPF.WriteRowNoFilter(row) csvPF.WriteRowNoFilter(row)
return return
for field in groupFieldsLists['cd']: for field in groupFieldsLists['cd']:
@@ -35935,7 +35935,7 @@ def doPrintCIGroups():
row = {} row = {}
if FJQC.formatJSON: if FJQC.formatJSON:
row['email'] = groupEntity['groupKey']['id'].lower() row['email'] = groupEntity['groupKey']['id'].lower()
row['JSON'] = json.dumps(groupEntity, ensure_ascii=False, sort_keys=True) row['JSON'] = json.dumps(cleanJSON(groupEntity, timeObjects=CIGROUP_TIME_OBJECTS), ensure_ascii=False, sort_keys=True)
if rolesSet and groupMembers is not None: if rolesSet and groupMembers is not None:
row['JSON-members'] = json.dumps(groupMembers, ensure_ascii=False, sort_keys=True) row['JSON-members'] = json.dumps(groupMembers, ensure_ascii=False, sort_keys=True)
csvPF.WriteRowNoFilter(row) csvPF.WriteRowNoFilter(row)