diff options
Diffstat (limited to 'eclass/distutils-r1.eclass')
| -rw-r--r-- | eclass/distutils-r1.eclass | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 171762c60ec2..334ce73a6503 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -242,10 +242,19 @@ esetup.py() { local die_args=() [[ ${EAPI} != [45] ]] && die_args+=( -n ) + [[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg + set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}" echo "${@}" >&2 - "${@}" || die "${die_args[@]}" || return ${?} + "${@}" || die "${die_args[@]}" + local ret=${?} + + if [[ ${BUILD_DIR} ]]; then + rm "${HOME}"/.pydistutils.cfg || die "${die_args[@]}" + fi + + return ${ret} } # @FUNCTION: distutils_install_for_testing @@ -436,7 +445,6 @@ _distutils-r1_copy_egg_info() { distutils-r1_python_compile() { debug-print-function ${FUNCNAME} "${@}" - _distutils-r1_create_setup_cfg _distutils-r1_copy_egg_info esetup.py build "${@}" @@ -511,9 +519,6 @@ distutils-r1_python_install() { # enable compilation for the install phase. local -x PYTHONDONTWRITEBYTECODE= - # re-create setup.cfg with install paths - _distutils-r1_create_setup_cfg - # python likes to compile any module it sees, which triggers sandbox # failures if some packages haven't compiled their modules yet. addpredict "${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" |