Commit 04bde282 authored by loring's avatar loring
Browse files

launchers: don't set PYTHONHOME/PYTHONPATH to folders that don't exist.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23082 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1d160b32
......@@ -142,9 +142,12 @@ if test -n "$visitpython"; then
# Set up Python variables so the binary will look for modules in their new
# home inside the VisIt installation instead of where Python was compiled.
export PYTHONHOME="$visitdir/lib/python"
unset PYTHONPATH
export PYTHONPATH="$PYTHONHOME/lib/python$pyver:$PYTHONHOME/lib/python$pyver/lib-dynload"
if [[ -d "$visitdir/lib/python" ]]
then
export PYTHONHOME="$visitdir/lib/python"
unset PYTHONPATH
export PYTHONPATH="$PYTHONHOME/lib/python$pyver:$PYTHONHOME/lib/python$pyver/lib-dynload"
fi
#echo "VisIt Python: $visitpython $frontendlauncherpy $0 ${1+"$@"}"
......
......@@ -2305,7 +2305,7 @@ class MainLauncher(object):
# If we're using VisIt's Python, set PYTHONHOME
visitlibdir_python = os.path.join(self.visitlibdir, "python")
if self.generalArgs.exe_name == "cli":
if (self.generalArgs.exe_name == "cli") and os.path.isdir(visitlibdir_python):
SETENV("PYTHONHOME", visitlibdir_python)
# Unset QT_PLUGIN_PATH
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment