From f236b986c44a3cc5df2cbeaf196b8c333d5d2112 Mon Sep 17 00:00:00 2001 From: cvw Date: Fri, 26 Jul 2013 13:17:45 +0000 Subject: [PATCH] skip cleandup in EnvFileConverter .sh --- bin/parseConfigFile.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bin/parseConfigFile.py b/bin/parseConfigFile.py index 808505561..db33a4fe0 100644 --- a/bin/parseConfigFile.py +++ b/bin/parseConfigFile.py @@ -250,6 +250,13 @@ class EnvFileConverter(object): value = self._purgeValue(value, k) line = ADD_TO_PREFIX + k + ": " + value # Update list of variable names + if "cleandup()" in line: + print "WARNING: parseConfigFile.py: skip cleandup and look for '# PRODUCT environment'" + while True: + line = self.fp.readline() + if "# PRODUCT environment" in line: + print "WARNING: parseConfigFile.py: '# PRODUCT environment' found" + break if "=" in line: variable, value = line.split('=') self.allParsedVariableNames.append(variable) @@ -296,7 +303,8 @@ class EnvFileConverter(object): # Convert .sh environment file to configuration file format def convertEnvFileToConfigFile(envFilename, configFilename): #reserved=['PATH', 'LD_LIBRARY_PATH', 'PYTHONPATH'] - reserved=['PATH', 'LD_LIBRARY_PATH', 'PYTHONPATH', 'MANPATH', 'R_LIBS', 'PV_PLUGIN_PATH'] + print "convert envFilename",envFilename + reserved=['PATH', 'LD_LIBRARY_PATH', 'PYTHONPATH', 'MANPATH', 'R_LIBS', 'PV_PLUGIN_PATH', 'TCLLIBPATH', 'TKLIBPATH'] fileContents = open(envFilename, 'r').read() pattern = re.compile('\n[\n]+', re.VERBOSE) # multiple '\n' -- 2.39.2