]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/PyModule: put mgr_module_path before Py_GetPath() 40534/head
authorKefu Chai <kchai@redhat.com>
Tue, 30 Mar 2021 18:32:38 +0000 (02:32 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 1 Apr 2021 02:32:42 +0000 (10:32 +0800)
commit450c0efa866d287a6f5509397ad5bd5798a5a6fc
tree96608b2b6fe57218d3fe68d6f57865e163007545
parent0cda86f81227f279292924066258807ec5eb341a
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)

Conflicts:
src/mgr/PyModule.cc: trivial resolution
src/mgr/PyModule.cc