From 62bceb30c5a368d5e94022693b02fd31297e4020 Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Thu, 1 Aug 2019 11:15:10 -0400 Subject: [PATCH] GAM 4.90, update mobile adjustments --- .travis.yml | 2 ++ src/gam.py | 6 +++--- src/var.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8dc2468c..249c1a3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,8 @@ cache: matrix: include: - os: linux + allow_failures: true + fast_finish: true name: "Linux 64-bit Bionic" dist: bionic language: bash diff --git a/src/gam.py b/src/gam.py index 39c798d8..22ab7067 100755 --- a/src/gam.py +++ b/src/gam.py @@ -9698,9 +9698,11 @@ def doUpdateMobile(): if resourceIds[:6] == 'query:': query = resourceIds[6:] 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: devices = [{'resourceId': resourceIds, 'email': ['not set']}] + doit = True i = 4 body = {} while i < len(sys.argv): @@ -9723,8 +9725,6 @@ def doUpdateMobile(): else: systemErrorExit(2, '%s is not a valid argument for "gam update mobile"' % sys.argv[i]) if body: - if len(devices) == 1: - doit = True if doit: print('Updating %s devices' % len(devices)) describe_as = 'Performing' diff --git a/src/var.py b/src/var.py index 93776fae..b34c93d2 100644 --- a/src/var.py +++ b/src/var.py @@ -6,7 +6,7 @@ import platform import re gam_author = 'Jay Lee ' -gam_version = '4.89' +gam_version = '4.90' gam_license = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' GAM_URL = 'https://git.io/gam'