GAM 4.90, update mobile adjustments

This commit is contained in:
Jay Lee
2019-08-01 11:15:10 -04:00
parent 8c736e52ac
commit 62bceb30c5
3 changed files with 6 additions and 4 deletions

View File

@@ -38,6 +38,8 @@ cache:
matrix: matrix:
include: include:
- os: linux - os: linux
allow_failures: true
fast_finish: true
name: "Linux 64-bit Bionic" name: "Linux 64-bit Bionic"
dist: bionic dist: bionic
language: bash language: bash

View File

@@ -9698,9 +9698,11 @@ def doUpdateMobile():
if resourceIds[:6] == 'query:': if resourceIds[:6] == 'query:':
query = resourceIds[6:] query = resourceIds[6:]
fields='nextPageToken,mobiledevices(resourceId,email)' fields='nextPageToken,mobiledevices(resourceId,email)'
devices = callGAPIpages(cd.mobiledevices(), 'list', customerId=GC_Values[GC_CUSTOMER_ID], items='mobiledevices', query=query, fields=fields) page_message = 'Got %%total_items%% mobile devices...\n'
devices = callGAPIpages(cd.mobiledevices(), 'list', page_message=page_message, customerId=GC_Values[GC_CUSTOMER_ID], items='mobiledevices', query=query, fields=fields)
else: else:
devices = [{'resourceId': resourceIds, 'email': ['not set']}] devices = [{'resourceId': resourceIds, 'email': ['not set']}]
doit = True
i = 4 i = 4
body = {} body = {}
while i < len(sys.argv): while i < len(sys.argv):
@@ -9723,8 +9725,6 @@ def doUpdateMobile():
else: else:
systemErrorExit(2, '%s is not a valid argument for "gam update mobile"' % sys.argv[i]) systemErrorExit(2, '%s is not a valid argument for "gam update mobile"' % sys.argv[i])
if body: if body:
if len(devices) == 1:
doit = True
if doit: if doit:
print('Updating %s devices' % len(devices)) print('Updating %s devices' % len(devices))
describe_as = 'Performing' describe_as = 'Performing'

View File

@@ -6,7 +6,7 @@ import platform
import re import re
gam_author = 'Jay Lee <jay0lee@gmail.com>' gam_author = 'Jay Lee <jay0lee@gmail.com>'
gam_version = '4.89' gam_version = '4.90'
gam_license = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' gam_license = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
GAM_URL = 'https://git.io/gam' GAM_URL = 'https://git.io/gam'