From d730e96c152cab1c088d81bba1289ea92debc743 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Fri, 12 Dec 2025 10:25:21 -0800 Subject: [PATCH] Fixed bug introduced in 7.30.00 that caused errors when reading CSV files. --- src/GamUpdate.txt | 2 ++ src/gam/__init__.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 2d4c3a6c..930d5b26 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,5 +1,7 @@ 7.30.01 +Fixed bug introduced in 7.30.00 that caused errors when reading CSV files. + Added the following options to `gam create focustime|outofoffice`: ``` ((date yyyy-mm-dd)| diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 58220188..dd511cd8 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -2909,6 +2909,8 @@ def cleanFilename(filename): def setFilePath(filename, cfgDir): if filename.startswith('./') or filename.startswith('.\\'): return os.path.join(os.getcwd(), filename[2:]) + if filename == '-': + return filename filename = os.path.expanduser(filename) if os.path.isabs(filename): return filename @@ -3763,7 +3765,7 @@ def SetGlobalVariables(): def _getCfgDirectory(sectionName, itemName): dirPath = os.path.expanduser(_stripStringQuotes(GM.Globals[GM.PARSER].get(sectionName, itemName))) - if (not dirPath) and (itemName in {GC.GMAIL_CSE_INCERT_DIR, GC.GMAIL_CSE_INKEY_DIR}): + if (not dirPath) and (itemName in {GC.GMAIL_CSE_INCERT_DIR, GC.GMAIL_CSE_INKEY_DIR, GC.INPUT_DIR}): return dirPath if (not dirPath) or (not os.path.isabs(dirPath) and dirPath != '.'): if (sectionName != configparser.DEFAULTSECT) and (GM.Globals[GM.PARSER].has_option(sectionName, itemName)): @@ -3839,7 +3841,7 @@ def SetGlobalVariables(): for itemName, itemEntry in GC.VAR_INFO.items(): if itemEntry[GC.VAR_TYPE] == GC.TYPE_DIRECTORY: dirPath = GC.Values[itemName] - if (not dirPath) and (itemName in {GC.GMAIL_CSE_INCERT_DIR, GC.GMAIL_CSE_INKEY_DIR}): + if (not dirPath) and (itemName in {GC.GMAIL_CSE_INCERT_DIR, GC.GMAIL_CSE_INKEY_DIR, GC.INPUT_DIR}): return if (itemName != GC.CACHE_DIR or not GC.Values[GC.NO_CACHE]) and not os.path.isdir(dirPath): writeStderr(formatKeyValueList(WARNING_PREFIX,