Commit 2712025a authored by Chris Burr's avatar Chris Burr
Browse files

Merge branch 'cburr-master-patch-20513' into 'master'

Isolate the bootstrap of LbEnv from the user environment

See merge request !24
parents 6c74d3f3 8fe89acc
Pipeline #2931633 passed with stages
in 2 minutes and 49 seconds
......@@ -21,9 +21,9 @@ if ( ! $?LBENV_SOURCED ) then
endif
source %lbenv_root%/$_host_os/bin/activate.csh
if ( `history 1 | wc -l` ) then
eval `python -m LbEnv --csh --siteroot %siteroot% !:2* || echo deactivate`
eval `python -I -m LbEnv --csh --siteroot %siteroot% !:2* || echo deactivate`
else
eval `python -m LbEnv --csh --siteroot %siteroot% || echo deactivate`
eval `python -I -m LbEnv --csh --siteroot %siteroot% || echo deactivate`
endif
else
echo "Platform not supported ($_host_os)"
......
......@@ -20,7 +20,7 @@ if [ -z "$LBENV_SOURCED" ] ; then
export PYTHONPATH=$(printenv PYTHONPATH | sed 's|[^:]\+/LBSCRIPTS/[^:]\+||g;s/::\+/:/g;s/:$//;s/^://')
fi
source ${OVERRIDE_LBENVROOT:-%lbenv_root%/$_host_os}/bin/activate
eval $(python -m LbEnv --sh --siteroot ${OVERRIDE_MYSITEROOT:-%siteroot%} "$@" || echo deactivate)
eval $(python -I -m LbEnv --sh --siteroot ${OVERRIDE_MYSITEROOT:-%siteroot%} "$@" || echo deactivate)
else
echo "Platform not supported: cannot find ${OVERRIDE_LBENVROOT:-%lbenv_root%/$_host_os}"
fi
......
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