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 A48F8138330 for ; Mon, 3 Oct 2016 15:33:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDA6BE0B10; Mon, 3 Oct 2016 15:33:18 +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 D4A21E0B10 for ; Mon, 3 Oct 2016 15:33:18 +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 CF4D2340E9C for ; Mon, 3 Oct 2016 15:33:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 847D22480 for ; Mon, 3 Oct 2016 15:33:15 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1475508769.016c65498fd675d39b641087a178094c88b81cb2.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/six/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/six/six-1.10.0.ebuild X-VCS-Directories: dev-python/six/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 016c65498fd675d39b641087a178094c88b81cb2 X-VCS-Branch: master Date: Mon, 3 Oct 2016 15:33:15 +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: 61b6b269-e0dc-4b3a-80ca-2e2d86561121 X-Archives-Hash: 9f687384d4054819bd862181acaca99a commit: 016c65498fd675d39b641087a178094c88b81cb2 Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 3 15:31:37 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Oct 3 15:32:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016c6549 dev-python/six: cd "${HOME}" in pkg_preinst Package-Manager: portage-2.3.1_p4_p808957 dev-python/six/six-1.10.0.ebuild | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index 29971c2..41801a1 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -58,8 +58,11 @@ python_install_all() { distutils-r1_python_install_all } +# Remove pkg_preinst in the next version bump pkg_preinst() { - # Remove this in the next version bump + # https://bugs.gentoo.org/585146 + cd "${HOME}" || die + _cleanup() { local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())") local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info" @@ -68,10 +71,5 @@ pkg_preinst() { rm -r "${egginfo}" || die "Failed to remove egg-info directory" fi } - # https://bugs.gentoo.org/585146 - local tmpdir="$(mktemp -d)" - [[ -n ${tmpdir} ]] || die - cd "${tmpdir}" || die python_foreach_impl _cleanup - rmdir "${tmpdir}" }