From: Kefu Chai Date: Wed, 19 Aug 2020 04:54:41 +0000 (+0800) Subject: ceph: correct additional paths added to sys.path X-Git-Tag: v16.1.0~1357^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36710%2Fhead;p=ceph.git ceph: correct additional paths added to sys.path pybind_path and pythonlib_path are already absolute paths, they are prepared before being passed to `respawn_in_path()`. so let's drop path components prepended to them. Signed-off-by: Kefu Chai --- diff --git a/src/ceph.in b/src/ceph.in index 9a711d1b4c0..d1f4d802214 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -87,8 +87,8 @@ def respawn_in_path(lib_path, pybind_path, pythonlib_path, asan_lib_path): if "CEPH_DEV" not in os.environ: print(DEVMODEMSG, file=sys.stderr) os.execvp(execv_cmd[0], execv_cmd) - sys.path.insert(0, os.path.join(MYDIR, pybind_path)) - sys.path.insert(0, os.path.join(MYDIR, pythonlib_path)) + sys.path.insert(0, pybind_path) + sys.path.insert(0, pythonlib_path) def get_pythonlib_dir():