From 94b05cdca212da1ed1dccd797a815e9a08fd1aa3 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Mon, 27 Feb 2017 20:29:54 -0800 Subject: [PATCH] sys-cluster/ceph: Revision bump, fix installation of python modules For some reason the ceph build system stopped installed required python modules for python2, and only installed them in python3. This fixes the problem so the ceph cli tools will work again. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- ...{ceph-10.2.5-r2.ebuild => ceph-10.2.5-r3.ebuild} | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) rename sys-cluster/ceph/{ceph-10.2.5-r2.ebuild => ceph-10.2.5-r3.ebuild} (94%) diff --git a/sys-cluster/ceph/ceph-10.2.5-r2.ebuild b/sys-cluster/ceph/ceph-10.2.5-r3.ebuild similarity index 94% rename from sys-cluster/ceph/ceph-10.2.5-r2.ebuild rename to sys-cluster/ceph/ceph-10.2.5-r3.ebuild index 568216bfa428..cce9b22dd9e3 100644 --- a/sys-cluster/ceph/ceph-10.2.5-r2.ebuild +++ b/sys-cluster/ceph/ceph-10.2.5-r3.ebuild @@ -135,7 +135,7 @@ user_setup() { } emake_python_bindings() { - local action="${1}" params binding + local action="${1}" params binding module shift params=("${@}") @@ -144,8 +144,15 @@ emake_python_bindings() { emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}" # these don't work and aren't needed on python3 - if [[ ${EBUILD_PHASE} == install ]] && python_is_python3; then - rm -f "${ED}/$(python_get_sitedir)"/ceph_{argparse,volume_client}.py + if [[ ${EBUILD_PHASE} == install ]]; then + for module in "${S}"/src/pybind/*.py; do + module_basename="$(basename "${module}")" + if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then + continue + elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then + python_domodule ${module} + fi + done fi } -- 2.26.2