mgorny 14/12/11 18:32:30 Modified: ChangeLog distutils-r1.eclass Log: Always restore initial directory after sub-phase run. Fixes bug #532168 and possibly more.
Revision Changes Path 1.1458 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1458&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1458&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1457&r2=1.1458 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1457 retrieving revision 1.1458 diff -u -r1.1457 -r1.1458 --- ChangeLog 11 Dec 2014 09:07:04 -0000 1.1457 +++ ChangeLog 11 Dec 2014 18:32:30 -0000 1.1458 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1457 2014/12/11 09:07:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1458 2014/12/11 18:32:30 mgorny Exp $ + + 11 Dec 2014; Michał Górny <[email protected]> distutils-r1.eclass: + Always restore initial directory after sub-phase run. Fixes bug #532168 and + possibly more. 11 Dec 2014; Michał Górny <[email protected]> distutils-r1.eclass: Restore using separate HOMEs for Python implementations, because of 1.106 eclass/distutils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.106&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.106&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.105&r2=1.106 Index: distutils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- distutils-r1.eclass 11 Dec 2014 09:07:04 -0000 1.105 +++ distutils-r1.eclass 11 Dec 2014 18:32:30 -0000 1.106 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.105 2014/12/11 09:07:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.106 2014/12/11 18:32:30 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -587,7 +587,7 @@ if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then - pushd "${BUILD_DIR}" >/dev/null || die + cd "${BUILD_DIR}" || die fi local BUILD_DIR=${BUILD_DIR}/build fi @@ -617,10 +617,7 @@ "${@}" - if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]] - then - popd >/dev/null || die - fi + cd "${_DISTUTILS_INITIAL_CWD}" || die } # @FUNCTION: _distutils-r1_run_common_phase @@ -635,6 +632,7 @@ local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR} if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + local _DISTUTILS_INITIAL_CWD=${PWD} local MULTIBUILD_VARIANTS _python_obtain_impls @@ -654,6 +652,8 @@ _distutils-r1_run_foreach_impl() { debug-print-function ${FUNCNAME} "${@}" + # store for restoring after distutils-r1_run_phase. + local _DISTUTILS_INITIAL_CWD=${PWD} set -- distutils-r1_run_phase "${@}" if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
