From 90fd503838591fadf11a9363ec6d3a549b58bfb0 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sat, 2 Jan 2016 11:59:37 -0800 Subject: [PATCH] If GA_DOMAIN not set, derive domain from GAM_ADMIN if defined If neither set, we have to decide what to do. --- src/gam.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gam.py b/src/gam.py index 6c07b125..238545de 100755 --- a/src/gam.py +++ b/src/gam.py @@ -506,6 +506,10 @@ def SetGlobalVariables(): GM_Globals[GM_LAST_UPDATE_CHECK_TXT] = os.path.join(GC_Values[GC_CONFIG_DIR], FN_LAST_UPDATE_CHECK_TXT) if not GC_Values[GC_NO_UPDATE_CHECK]: doGAMCheckForUpdates() + if (not GC_Values[GC_DOMAIN]) and GC_Values[GC_ADMIN]: + loc = GC_Values[GC_ADMIN].find(u'@') + if loc > 0: + GC_Values[GC_DOMAIN] = GC_Values[GC_ADMIN][loc+1:] # Globals derived from config file values GM_Globals[GM_EXTRA_ARGS_DICT] = {u'prettyPrint': GC_Values[GC_DEBUG_LEVEL] > 0} httplib2.debuglevel = GC_Values[GC_DEBUG_LEVEL]