diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-12-20 15:53:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-20 15:53:19 +0000 |
| commit | 6147e64c136427d4542c57d5347b78ec9f104d92 (patch) | |
| tree | 692e209429810f59e8e355b292c2ede2873fe379 /eclass | |
| parent | Fix masking of Amarok Live SVN ebuild. (diff) | |
| download | gentoo-2-6147e64c136427d4542c57d5347b78ec9f104d92.tar.gz gentoo-2-6147e64c136427d4542c57d5347b78ec9f104d92.tar.bz2 gentoo-2-6147e64c136427d4542c57d5347b78ec9f104d92.zip | |
Bug #202748 - In setup_mpm(), initialize MY_MPM to an empty
string before entering the loop so that it still works when
setup_mpm() is called a second time during pkg_setup() of a
binary package. This is needed for compatibility with
portage-2.1.4 since the MY_MPM value from build time will
still exist at binary package installation time. Thanks to
Tais M. Hansen for <tais.hansen@osd.dk> for debugging this.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/apache-2.eclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 42d07e106cce..a311968acda8 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.3 2007/12/15 14:00:19 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.4 2007/12/20 15:53:19 zmedico Exp $ # @ECLASS: apache-2 # @MAINTAINER: apache-devs@gentoo.org @@ -92,6 +92,7 @@ S="${WORKDIR}/httpd-${PV}" # This internal function makes sure that only one of APACHE2_MPMS was selected # or a default based on USE=threads is selected if APACHE2_MPMS is empty setup_mpm() { + MY_MPM="" for x in ${IUSE_MPMS} ; do if use apache2_mpms_${x} ; then if [[ -z "${MY_MPM}" ]] ; then |