From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28304139694 for ; Tue, 28 Feb 2017 04:30:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC287E0CAD; Tue, 28 Feb 2017 04:30:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9290AE0CAD for ; Tue, 28 Feb 2017 04:30:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3846F341301 for ; Tue, 28 Feb 2017 04:30:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75C34571F for ; Tue, 28 Feb 2017 04:30:30 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1488256223.94b05cdca212da1ed1dccd797a815e9a08fd1aa3.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-10.2.5-r2.ebuild sys-cluster/ceph/ceph-10.2.5-r3.ebuild X-VCS-Directories: sys-cluster/ceph/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 94b05cdca212da1ed1dccd797a815e9a08fd1aa3 X-VCS-Branch: master Date: Tue, 28 Feb 2017 04:30:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c5083696-1231-49ca-b736-0d108f54082d X-Archives-Hash: f846b2091e0b16d49752a0036213fec5 commit: 94b05cdca212da1ed1dccd797a815e9a08fd1aa3 Author: Patrick McLean gentoo org> AuthorDate: Tue Feb 28 04:29:54 2017 +0000 Commit: Patrick McLean gentoo org> CommitDate: Tue Feb 28 04:30:23 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94b05cdc 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/{ceph-10.2.5-r2.ebuild => ceph-10.2.5-r3.ebuild} | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 568216bfa4..cce9b22dd9 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 }