diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2006-01-28 01:35:11 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2006-01-28 01:35:11 +0000 |
| commit | ca5286fd2381f76034388ce4eafe13c3fc5b24be (patch) | |
| tree | 1dd06391a0d67bdc5f76fe468dbf347bf9f04e22 /eclass | |
| parent | Masking rar as it pulls in a binary only x86 package. (diff) | |
| download | gentoo-2-ca5286fd2381f76034388ce4eafe13c3fc5b24be.tar.gz gentoo-2-ca5286fd2381f76034388ce4eafe13c3fc5b24be.tar.bz2 gentoo-2-ca5286fd2381f76034388ce4eafe13c3fc5b24be.zip | |
Fix wrong exitstatus in php-select.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php4_4-sapi.eclass | 6 | ||||
| -rw-r--r-- | eclass/php5_0-sapi.eclass | 6 | ||||
| -rw-r--r-- | eclass/php5_1-sapi.eclass | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass index 1f65ac9ce933..45858e2442ea 100644 --- a/eclass/php4_4-sapi.eclass +++ b/eclass/php4_4-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.11 2006/01/23 18:46:49 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.12 2006/01/28 01:35:11 chtekk Exp $ # # ######################################################################## # @@ -588,7 +588,7 @@ php4_4-sapi_pkg_postinst() { if useq apache ; then "${ROOT}/usr/sbin/php-select" -t apache1 php4 > /dev/null 2>&1 exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then + if [[ ${exitStatus} == 2 ]] ; then php-select apache1 php4 elif [[ ${exitStatus} == 4 ]] ; then ewarn @@ -604,7 +604,7 @@ php4_4-sapi_pkg_postinst() { if useq apache2 ; then "${ROOT}/usr/sbin/php-select" -t apache2 php4 > /dev/null 2>&1 exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then + if [[ ${exitStatus} == 2 ]] ; then php-select apache2 php4 elif [[ ${exitStatus} == 4 ]] ; then ewarn diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass index f46822d28adb..76cc4d27645f 100644 --- a/eclass/php5_0-sapi.eclass +++ b/eclass/php5_0-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.13 2006/01/23 18:46:49 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.14 2006/01/28 01:35:11 chtekk Exp $ # # ######################################################################## # @@ -591,7 +591,7 @@ php5_0-sapi_pkg_postinst() { if useq apache ; then "${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1 exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then + if [[ ${exitStatus} == 2 ]] ; then php-select apache1 php5 elif [[ ${exitStatus} == 4 ]] ; then ewarn @@ -607,7 +607,7 @@ php5_0-sapi_pkg_postinst() { if useq apache2 ; then "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1 exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then + if [[ ${exitStatus} == 2 ]] ; then php-select apache2 php5 elif [[ ${exitStatus} == 4 ]] ; then ewarn diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass index b525cd651811..ca27e2dc8092 100644 --- a/eclass/php5_1-sapi.eclass +++ b/eclass/php5_1-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.14 2006/01/23 18:46:49 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.15 2006/01/28 01:35:11 chtekk Exp $ # # ######################################################################## # @@ -622,7 +622,7 @@ php5_1-sapi_pkg_postinst() { if useq apache ; then "${ROOT}/usr/sbin/php-select" -t apache1 php5 > /dev/null 2>&1 exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then + if [[ ${exitStatus} == 2 ]] ; then php-select apache1 php5 elif [[ ${exitStatus} == 4 ]] ; then ewarn @@ -638,7 +638,7 @@ php5_1-sapi_pkg_postinst() { if useq apache2 ; then "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1 exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then + if [[ ${exitStatus} == 2 ]] ; then php-select apache2 php5 elif [[ ${exitStatus} == 4 ]] ; then ewarn |