]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/PyModule: put mgr_module_path before Py_GetPath() 40505/head
authorKefu Chai <kchai@redhat.com>
Tue, 30 Mar 2021 18:32:38 +0000 (02:32 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 30 Mar 2021 18:47:39 +0000 (02:47 +0800)
commit8638f526a9d04c3dfd758073980d709165070336
tree0fc44e89bb454cc76f694efb26f5a68f45ac1adb
parent790326280bc8a3755698d4b53cfa44baefc6025d
mgr/PyModule: put mgr_module_path before Py_GetPath()

pip comes with _vendor/progress. so there is chance to import the vendored
version of "progress" module instead of the "progress" mgr module, and
fail to import the latter.

in this change, the order of paths are rearranged so the configured
`mgr_module_path` is put before the return value of `Py_GetPath()`.

Fixes: https://tracker.ceph.com/issues/50058
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mgr/PyModule.cc