]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
init-ceph: s/lib.2/lib.$MGR_PYTHON_VERSION_MAJOR/
authorKefu Chai <kchai@redhat.com>
Thu, 8 Feb 2018 11:04:42 +0000 (19:04 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 11 Feb 2018 06:12:15 +0000 (14:12 +0800)
we should not hardwire cython_modules's path to lib.2, it should be
cython_modules/lib.3 if ceph-mgr requires python3.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/init-ceph.in

index e8c0ada2b3a1a6419e40deedc979c334fb151975..d13032a167528dfbac4dc86321813c31d3133845 100755 (executable)
@@ -34,7 +34,7 @@ else
        ETCDIR=.
        ASSUME_DEV=1
        CEPH_LIB=$CEPH_ROOT/build/lib
-       echo "$PYTHONPATH" | grep -q $CEPH_LIB || export PYTHONPATH=$CEPH_LIB/cython_modules/lib.2:$PYTHONPATH
+       echo "$PYTHONPATH" | grep -q $CEPH_LIB || export PYTHONPATH=$CEPH_LIB/cython_modules/lib.@MGR_PYTHON_VERSION_MAJOR@:$PYTHONPATH
        echo "$LD_LIBRARY_PATH" | grep -q $CEPH_LIB || export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH
        echo "$DYLD_LIBRARY_PATH" | grep -q $CEPH_LIB || export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH
     else