deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 18:01:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jay0lee/GAM

Browse Source
This commit is contained in:
Jay Lee
2019-08-27 10:19:48 -04:00
parent 4851d5b62f 1a0f9ab66a
commit 29db574bc5
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gam.py
View File

@@ -7583,7 +7583,7 @@ def getUserAttributes(i, cd, updateCmd):
i += 2
elif myarg in ['recoveryphone']:
body['recoveryPhone'] = sys.argv[i+1]
if body['recoveryPhone'][0] != '+':
if body['recoveryPhone'] and body['recoveryPhone'][0] != '+':
body['recoveryPhone'] = '+' + body['recoveryPhone']
i += 2
elif myarg == 'clearschema':
@@ -10528,6 +10528,8 @@ def doGetCrosInfo():
print('CrOS Device: {0} ({1} of {2})'.format(deviceId, i, device_count))
if 'notes' in cros:
cros['notes'] = cros['notes'].replace('\n', '\\n')
if 'autoUpdateExpiration' in cros:
cros['autoUpdateExpiration'] = utils.formatTimestampYMD(cros['autoUpdateExpiration'])
_checkTPMVulnerability(cros)
if guess_aue:
_guessAUE(cros, guessedAUEs)
@@ -12653,6 +12655,8 @@ def doPrintCrosDevices():
for cros in all_cros:
if 'notes' in cros:
cros['notes'] = cros['notes'].replace('\n', '\\n')
if 'autoUpdateExpiration' in cros:
cros['autoUpdateExpiration'] = utils.formatTimestampYMD(cros['autoUpdateExpiration'])
for cpuStatusReport in cros.get('cpuStatusReports', []):
for tempInfo in cpuStatusReport.get('cpuTemperatureInfo', []):
tempInfo['label'] = tempInfo['label'].strip()
@@ -12661,6 +12665,8 @@ def doPrintCrosDevices():
for cros in all_cros:
if 'notes' in cros:
cros['notes'] = cros['notes'].replace('\n', '\\n')
if 'autoUpdateExpiration' in cros:
cros['autoUpdateExpiration'] = utils.formatTimestampYMD(cros['autoUpdateExpiration'])
row = {}
for attrib in cros:
if attrib not in set(['kind', 'etag', 'tpmVersionInfo', 'recentUsers', 'activeTimeRanges',