From a3be372ccddc05ff2fbf38fca9599aa3fe9c16f1 Mon Sep 17 00:00:00 2001 From: Marco Biasini <marco.biasini@unibas.ch> Date: Wed, 8 May 2013 11:07:38 +0200 Subject: [PATCH] remove 'ost' directory from sys.path since the ost startup script lives in the same directory as the top-level ost modules (python{version}/site-packages/ost), the directory got automatically added to sys.path. That's bad for several reasons I don't want to go in right now (see discussion on the mailing list). Instead of passing the script as a script name to execute, we now use execfile with the startup script. This circumvents addition of the directory to the path and makes Gabriel smile again. --- scripts/ost.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ost.in b/scripts/ost.in index dcbe81d4e..f610b2446 100755 --- a/scripts/ost.in +++ b/scripts/ost.in @@ -31,6 +31,6 @@ BIN_DIR=`dirname "$SCRIPT_NAME"` source "$BIN_DIR/../@LIBEXEC_PATH@/ost_config" -$pyexec $interactive "$DNG_ROOT/@LIBDIR@/python@PYTHON_VERSION@/site-packages/ost/ost_startup.py" $opts +$pyexec $interactive -c "execfile('$DNG_ROOT/@LIBDIR@/python@PYTHON_VERSION@/site-packages/ost/ost_startup.py')" $opts RC=$? exit $RC -- GitLab