deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-08 13:43:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

handle no results on Gmail profile

Browse Source
This commit is contained in:
Jay Lee
2015-12-23 06:50:57 -05:00
parent ac3dbd25f3
commit ade2d0ae54
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gam.py
View File

@ -1608,6 +1608,7 @@ def doPrintAdmins():
cd = buildGAPIObject(u'directory') cd = buildGAPIObject(u'directory')
roleId = None roleId = None
userKey = None userKey = None
todrive = False
i = 3 i = 3
while i < len(sys.argv): while i < len(sys.argv):
if sys.argv[i].lower() == u'user': if sys.argv[i].lower() == u'user':
@ -1623,6 +1624,9 @@ def doPrintAdmins():
print u'ERROR: %s is not a valid role' % role print u'ERROR: %s is not a valid role' % role
sys.exit(5) sys.exit(5)
i += 2 i += 2
elif sys.argv[i].lower() == u'todrive':
todrive = True
i += 1
else: else:
print u'ERROR: %s is not a valid argument for "gam print admins".' % sys.argv[i] print u'ERROR: %s is not a valid argument for "gam print admins".' % sys.argv[i]
sys.exit(2) sys.exit(2)
@ -1653,7 +1657,7 @@ def doPrintAdmins():
admins_attrib[0][u'orgUnit'] = u'orgUnit' admins_attrib[0][u'orgUnit'] = u'orgUnit'
admin_attrib[u'orgUnit'] = orgUnit admin_attrib[u'orgUnit'] = orgUnit
admins_attrib.append(admin_attrib) admins_attrib.append(admin_attrib)
output_csv(admins_attrib, admins_attrib[0], u'Admins', False) output_csv(admins_attrib, admins_attrib[0], u'Admins', todrive)
def buildOrgUnitIdToNameMap(): def buildOrgUnitIdToNameMap():
cd = buildGAPIObject(u'directory') cd = buildGAPIObject(u'directory')
@ -4558,6 +4562,7 @@ def showGmailProfile(users):
if not gmail: if not gmail:
continue continue
results = callGAPI(service=gmail.users(), function=u'getProfile', userId=u'me', soft_errors=True) results = callGAPI(service=gmail.users(), function=u'getProfile', userId=u'me', soft_errors=True)
if results:
for item in results: for item in results:
if item not in profiles[0]: if item not in profiles[0]:
profiles[0][item] = item profiles[0][item] = item