summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-10-12 11:08:12 +0000
committerMichał Górny <mgorny@gentoo.org>2013-10-12 11:08:12 +0000
commitf64ca36b3e75ce5fb0dad11b97d0b60efb3935ba (patch)
tree6c2a4fd2c42385b906ffdc993e0d6bea46e91861 /eclass
parentkeyword ~amd64-fbsd, bug #487266 (diff)
downloadgentoo-2-f64ca36b3e75ce5fb0dad11b97d0b60efb3935ba.tar.gz
gentoo-2-f64ca36b3e75ce5fb0dad11b97d0b60efb3935ba.tar.bz2
gentoo-2-f64ca36b3e75ce5fb0dad11b97d0b60efb3935ba.zip
Do not look up Python for binary package install.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/python-any-r1.eclass6
2 files changed, 9 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index e477b72254eb..f758f31a4209 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1018 2013/10/10 06:10:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1019 2013/10/12 11:08:12 mgorny Exp $
+
+ 12 Oct 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass:
+ Do not look up Python for binary package install.
10 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
Do not alter HOME and TMPDIR when single impl is being used. This may
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c5c65a3fd69f..760e8e758c72 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.14 2013/09/24 19:53:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.15 2013/10/12 11:08:12 mgorny Exp $
# @ECLASS: python-any-r1
# @MAINTAINER:
@@ -266,6 +266,10 @@ _python_EPYTHON_supported() {
python-any-r1_pkg_setup() {
debug-print-function ${FUNCNAME} "${@}"
+ # avoid looking up Python for binary package install.
+ # if you need Python during pkg_preinst/_postinst, please let us know.
+ [[ ${MERGE_TYPE} == binary ]] && return 0
+
# first, try ${EPYTHON}... maybe it's good enough for us.
if [[ ${EPYTHON} ]]; then
if _python_EPYTHON_supported "${EPYTHON}"; then