diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2003-10-26 21:11:13 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-10-26 21:11:13 +0000 |
| commit | 88a8eb83dc8402e9a999496496f625b2bbcd2638 (patch) | |
| tree | a27e456853af0987315027002a93f052cfb71003 /eclass | |
| parent | Version bumped. (diff) | |
| download | gentoo-2-88a8eb83dc8402e9a999496496f625b2bbcd2638.tar.gz gentoo-2-88a8eb83dc8402e9a999496496f625b2bbcd2638.tar.bz2 gentoo-2-88a8eb83dc8402e9a999496496f625b2bbcd2638.zip | |
fix bug #32013
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/php.eclass b/eclass/php.eclass index 8fb3a8720608..be18f162d19d 100644 --- a/eclass/php.eclass +++ b/eclass/php.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/php.eclass,v 1.87 2003/10/26 21:01:05 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php.eclass,v 1.88 2003/10/26 21:11:13 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> # This EBUILD is totally masked presently. Use it at your own risk. I know it @@ -173,8 +173,9 @@ php_check_java_config() { die fi - JDKVER="$(java-config --java-version | head -n1 | cut -d\" -f2)" - if [ -n "${JDKVER/1.4.*}" ]; then + JDKVER="$(java-config --java-version 2>&1 | head -n1 | cut -d\" -f2)" + einfo "JDK version: ${JDKVER}" + if [ -n "${JDKVER/1.4.*}" -o -z "${JDKVER}" ]; then eerror "Please ensure that you have a JDK with a version of at least" eerror "1.4 selected using java-config" die |