summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2005-08-11 09:04:06 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2005-08-11 09:04:06 +0000
commit98cf70dee0e55fe9410ec342f8f9f5445c709b36 (patch)
tree8376e29d87749a57c11ab07c36b1e580bc7901f2 /eclass/php-sapi.eclass
parentcorrect sanity checks and info messages in init scripts; version bumped with ... (diff)
downloadgentoo-2-98cf70dee0e55fe9410ec342f8f9f5445c709b36.tar.gz
gentoo-2-98cf70dee0e55fe9410ec342f8f9f5445c709b36.tar.bz2
gentoo-2-98cf70dee0e55fe9410ec342f8f9f5445c709b36.zip
Bug #101981, die messages not being printed properly.
Diffstat (limited to 'eclass/php-sapi.eclass')
-rw-r--r--eclass/php-sapi.eclass14
1 files changed, 11 insertions, 3 deletions
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 52fc4b155d0a..0485770584e5 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-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/php-sapi.eclass,v 1.84 2005/07/23 05:25:50 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.85 2005/08/11 09:04:06 robbat2 Exp $
# Author: Robin H. Johnson <robbat2@gentoo.org>
inherit eutils flag-o-matic multilib libtool
@@ -275,9 +275,17 @@ php-sapi_src_compile() {
libdir="$(get_libdir)"
# sanity checks
- [ -x "/usr/sbin/sendmail" ] || die "You need a virtual/mta that provides /usr/sbin/sendmail!"
+ if [ ! -x "/usr/sbin/sendmail" ]; then
+ msg="You need a virtual/mta that provides /usr/sbin/sendmail!"
+ eerror "${msg}"
+ die "${msg}"
+ fi
- [ -f "/proc/self/stat" ] || die "You need /proc mounted for configure to complete correctly!"
+ if [ ! -f "/proc/self/stat" ]; then
+ msg="You need /proc mounted for configure to complete correctly!"
+ eerror "${msg}"
+ die "${msg}"
+ fi
use java && use !alpha && use !amd64 && php-sapi_check_java_config