deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Fix handling of nonexistent extra-args.txt

Browse Source
This commit is contained in:
Ross Scroggs
2016-01-22 07:25:01 -08:00
parent 4a168d16a3
commit 9c368b7d10
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gam.py
View File

@@ -484,6 +484,8 @@ def SetGlobalVariables():
def _getCfgFile(itemName): def _getCfgFile(itemName):
value = os.path.expanduser(GC_Defaults[itemName]) value = os.path.expanduser(GC_Defaults[itemName])
if (not value) and (itemName == GC_EXTRA_ARGS):
return value
if not os.path.isabs(value): if not os.path.isabs(value):
value = os.path.expanduser(os.path.join(GC_Values[GC_CONFIG_DIR], value)) value = os.path.expanduser(os.path.join(GC_Values[GC_CONFIG_DIR], value))
return value return value
@@ -499,6 +501,8 @@ def SetGlobalVariables():
for itemName in GC_VAR_INFO: for itemName in GC_VAR_INFO:
if GC_VAR_INFO[itemName][GC_VAR_TYPE_KEY] == GC_TYPE_FILE: if GC_VAR_INFO[itemName][GC_VAR_TYPE_KEY] == GC_TYPE_FILE:
fileName = GC_Values[itemName] fileName = GC_Values[itemName]
if (not fileName) and (itemName == GC_EXTRA_ARGS):
continue
if not os.path.isfile(fileName): if not os.path.isfile(fileName):
sys.stderr.write(u'{0}{1}={2}, Not Found\n'.format(WARNING_PREFIX, GC_VAR_INFO[itemName][GC_VAR_ENVVAR_KEY], fileName)) sys.stderr.write(u'{0}{1}={2}, Not Found\n'.format(WARNING_PREFIX, GC_VAR_INFO[itemName][GC_VAR_ENVVAR_KEY], fileName))