diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-07-30 14:52:18 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-07-30 14:52:18 +0000 |
| commit | ac47fb15ddc8d25d179e0c5e1cf52d7d7e288742 (patch) | |
| tree | 81078fb95976d0f2917ac9b0131c25901b367444 /eclass/multiprocessing.eclass | |
| parent | Cleanup. (diff) | |
| download | gentoo-2-ac47fb15ddc8d25d179e0c5e1cf52d7d7e288742.tar.gz gentoo-2-ac47fb15ddc8d25d179e0c5e1cf52d7d7e288742.tar.bz2 gentoo-2-ac47fb15ddc8d25d179e0c5e1cf52d7d7e288742.zip | |
drop ebuild die hook once we have finished as there is no need to cleanup anymore
Diffstat (limited to 'eclass/multiprocessing.eclass')
| -rw-r--r-- | eclass/multiprocessing.eclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass index cdf1053cdef8..f3f81e231b34 100644 --- a/eclass/multiprocessing.eclass +++ b/eclass/multiprocessing.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/multiprocessing.eclass,v 1.1 2012/06/07 04:59:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multiprocessing.eclass,v 1.2 2012/07/30 14:52:18 vapier Exp $ # @ECLASS: multiprocessing.eclass # @MAINTAINER: @@ -63,7 +63,7 @@ makeopts_jobs() { multijob_init() { # When something goes wrong, try to wait for all the children so we # don't leave any zombies around. - has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait" + has wait ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" wait " # Setup a pipe for children to write their pids to when they finish. local pipe="${T}/multijob.pipe" @@ -190,6 +190,9 @@ multijob_finish() { # Do this after reaping all the children. [[ $# -eq 0 ]] || die "${FUNCNAME} takes no arguments" + # No need to hook anymore. + EBUILD_DEATH_HOOKS=${EBUILD_DEATH_HOOKS/ wait / } + return ${ret} } |