diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-12-24 02:51:25 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-12-24 02:51:25 +0000 |
commit | 6730b1915a56e215201aece6d9c568550f5fec44 (patch) | |
tree | 7cdd6fb4bf7562db0ce87229a99f9940bb6fc64d /eclass | |
parent | Version bump #439806 by Sebastian Pipping. (diff) | |
download | gentoo-2-6730b1915a56e215201aece6d9c568550f5fec44.tar.gz gentoo-2-6730b1915a56e215201aece6d9c568550f5fec44.tar.bz2 gentoo-2-6730b1915a56e215201aece6d9c568550f5fec44.zip |
Fix python-any-r1_pkg_setup fallback logic.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 5 | ||||
-rw-r--r-- | eclass/python-any-r1.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8499521e8bf6..b4375f3a3cc7 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.574 2012/12/22 03:57:14 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.575 2012/12/24 02:51:25 zmedico Exp $ + + 24 Dec 2012; Zac Medico <zmedico@gentoo.org> python-any-r1.eclass: + Fix python-any-r1_pkg_setup fallback logic. 22 Dec 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: Tweak sed expression to match against Qt 4.8.4 too. Thanks to Tomasz diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 734d3dbae799..3af4b5b51870 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.3 2012/12/20 23:35:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.4 2012/12/24 02:51:25 zmedico Exp $ # @ECLASS: python-any-r1 # @MAINTAINER: @@ -205,7 +205,7 @@ python-any-r1_pkg_setup() { local PYTHON_PKG_DEP for i in "${rev_impls[@]}"; do python_export "${i}" PYTHON_PKG_DEP EPYTHON PYTHON - has_version "${PYTHON_PKG_DEP}" && break + ROOT=/ has_version "${PYTHON_PKG_DEP}" && return done die $EPYTHON |