diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-12-07 17:56:22 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-12-07 17:56:22 +0000 |
| commit | 1151e751a807ff50f6f72f84fc661fa98dcef688 (patch) | |
| tree | 2e90ee8af8c2a6298f738f99855be5c54b84f321 /eclass | |
| parent | Stable for x86, wrt bug #441100 (diff) | |
| download | historical-1151e751a807ff50f6f72f84fc661fa98dcef688.tar.gz historical-1151e751a807ff50f6f72f84fc661fa98dcef688.tar.bz2 historical-1151e751a807ff50f6f72f84fc661fa98dcef688.zip | |
Do not die when sub-phases return non-true value. This is inconsistent with normal phase behavior and not really useful since phase functions are supposed to die on their own.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 6380ccdcbb4b..dc3c4a0e7809 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.547 2012/12/07 17:55:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.548 2012/12/07 17:56:22 mgorny Exp $ + + 07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: + Do not die when sub-phases return non-true value. This is inconsistent with + normal phase behavior and not really useful since phase functions are + supposed to die on their own. 07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: Pass the best Python implementation info to the implementation-common phase diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 4e097f8c29ef..165f37590206 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-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/distutils-r1.eclass,v 1.25 2012/12/07 17:55:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.26 2012/12/07 17:56:22 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -380,9 +380,9 @@ distutils-r1_run_phase() { fi if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then - "${@}" || die "${1} failed." + "${@}" else - multijob_child_init "${@}" || die "${1} failed." + multijob_child_init "${@}" fi if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then |