From 8c50be5df637d48b22861c4977ce1b53f860a5ff Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 4 Jul 2019 14:03:38 +0200 Subject: [PATCH] vstart: Add python-common Signed-off-by: Sebastian Wagner --- src/vstart.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index f36a0820bdbb9..b258cde9ac470 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -58,6 +58,7 @@ elif [ -n "$CEPH_ROOT" ]; then [ -z "$CEPH_LIB" ] && CEPH_LIB=$CEPH_BUILD_DIR/lib [ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB [ -z "$EC_PATH" ] && EC_PATH=$CEPH_LIB + [ -z "$CEPH_PYTHON_COMMON" ] && CEPH_PYTHON_COMMON=$CEPH_ROOT/src/python-common fi if [ -z "${CEPH_VSTART_WRAPPER}" ]; then @@ -66,7 +67,10 @@ fi [ -z "$PYBIND" ] && PYBIND=./pybind -export PYTHONPATH=$PYBIND:$CEPH_LIB/cython_modules/lib.${CEPH_PY_VERSION_MAJOR}:$PYTHONPATH +[ -n "$CEPH_PYTHON_COMMON" ] && CEPH_PYTHON_COMMON="$CEPH_PYTHON_COMMON:" +CYTHON_PYTHONPATH="$CEPH_LIB/cython_modules/lib.${CEPH_PY_VERSION_MAJOR}" +export PYTHONPATH=$PYBIND:$CYTHON_PYTHONPATH:$CEPH_PYTHON_COMMON$PYTHONPATH + export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH # Suppress logging for regular use that indicated that we are using a @@ -1336,7 +1340,7 @@ echo "" echo "#" } > $CEPH_DIR/vstart_environment.sh { - echo "export PYTHONPATH=$PYBIND:$CEPH_LIB/cython_modules/lib.${CEPH_PY_VERSION_MAJOR}:\$PYTHONPATH" + echo "export PYTHONPATH=$PYBIND:$CYTHON_PYTHONPATH:$CEPH_PYTHON_COMMON\$PYTHONPATH" echo "export LD_LIBRARY_PATH=$CEPH_LIB:\$LD_LIBRARY_PATH" if [ "$CEPH_DIR" != "$PWD" ]; then -- 2.39.5