diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2003-08-05 17:00:38 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2003-08-05 17:00:38 +0000 |
| commit | 0e96698cd208541994b2a964ed6951ef4b91cfb3 (patch) | |
| tree | 35db9fc2e84a28797e8b25b53445f20a75930432 /eclass | |
| parent | repoman (diff) | |
| download | historical-0e96698cd208541994b2a964ed6951ef4b91cfb3.tar.gz historical-0e96698cd208541994b2a964ed6951ef4b91cfb3.tar.bz2 historical-0e96698cd208541994b2a964ed6951ef4b91cfb3.zip | |
Fix for bug #25879
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/webapp-apache.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/webapp-apache.eclass b/eclass/webapp-apache.eclass index 6baedbf37330..92ebb1eb8261 100644 --- a/eclass/webapp-apache.eclass +++ b/eclass/webapp-apache.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.5 2003/08/04 11:07:23 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.6 2003/08/05 17:00:38 stuart Exp $ # # Author: Stuart Herbert <stuart@gentoo.org> # @@ -24,16 +24,16 @@ EXPORT_FUNCTIONS pkg_preinst function webapp-apache-detect () { APACHEVER= - has_version '=net-www/apache-1*' && APACHEVER=1 - has_version '=net-www/apache-2*' && use apache2 && APACHEVER=2 - [ -z "${APACHEVER}" ] && has_version '=net-www/apache-2*' && APACHEVER=2 + has_version '=net-www/apache-1*' && APACHEVER=1 && CONFVER= + has_version '=net-www/apache-2*' && use apache2 && APACHEVER=2 && CONFVER=2 + [ -z "${APACHEVER}" ] && has_version '=net-www/apache-2*' && APACHEVER=2 && CONFVER=2 if [ "${APACHEVER}+" = "+" ]; then # no apache version detected return 1 fi - APACHECONF="/etc/apache${APACHEVER}/conf/apache${APACHEVER}.conf" + APACHECONF="/etc/apache${CONFVER}/conf/apache${CONFVER}.conf" WEBAPP_SERVER="Apache v${APACHEVER}" } |