diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2007-05-13 20:11:37 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2007-05-13 20:11:37 +0000 |
| commit | 4b3b267ed28de1c42a806cd9ca1d6931adf75f11 (patch) | |
| tree | 1169c9fb708c2f55c6ae5b799739d786eed14831 /eclass | |
| parent | ia64 + x86 stable wrt bug 178346 (diff) | |
| download | gentoo-2-4b3b267ed28de1c42a806cd9ca1d6931adf75f11.tar.gz gentoo-2-4b3b267ed28de1c42a806cd9ca1d6931adf75f11.tar.bz2 gentoo-2-4b3b267ed28de1c42a806cd9ca1d6931adf75f11.zip | |
Fix setting of Apache variables in need_apache (2nd part of fix for #178380).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/depend.apache.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index a6cb36277d64..ac0a78a4a463 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.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/depend.apache.eclass,v 1.31 2007/05/12 03:47:35 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.32 2007/05/13 20:11:37 chtekk Exp $ inherit multilib @@ -226,7 +226,7 @@ need_apache2_2() { need_apache() { debug-print-function $FUNCNAME $* - local supports20 supports22 supports2x + local supports2x supports20 supports22 if [[ $# -eq 0 ]] ; then supports2x="yes" @@ -242,7 +242,7 @@ need_apache() { fi if [[ "${supports20}" == "yes" ]] && [[ "${supports22}" == "yes" ]] ; then - supports2x="yes"; + supports2x="yes" fi debug-print "supports20: ${supports20}" @@ -256,6 +256,8 @@ need_apache() { elif [[ "${supports22}" == "yes" ]] ; then need_apache2_2 fi + + uses_apache2 } want_apache() { |