]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/PyModule: put mgr_module_path before Py_GetPath() 40517/head
authorKefu Chai <kchai@redhat.com>
Tue, 30 Mar 2021 18:32:38 +0000 (02:32 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 31 Mar 2021 05:45:53 +0000 (13:45 +0800)
commit83c7338ee3c3395aa8205df6962cb5aa093f2d33
tree71f6c32cbc9318be6acf8a829beff726fe5b0092
parent3d288a0782cae470cb84d1255a70892d7a322b35
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>
(cherry picked from commit 8638f526a9d04c3dfd758073980d709165070336)
src/mgr/PyModule.cc