summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMarkus Ullmann <jokey@gentoo.org>2007-08-27 11:17:32 +0000
committerMarkus Ullmann <jokey@gentoo.org>2007-08-27 11:17:32 +0000
commit082199328bf1cd122e0d0957702c1895d6a7d207 (patch)
treefa6fd658aacbc9afeb2382efa27d8dc59055f356 /eclass
parentDie properly on errors (diff)
downloadgentoo-2-082199328bf1cd122e0d0957702c1895d6a7d207.tar.gz
gentoo-2-082199328bf1cd122e0d0957702c1895d6a7d207.tar.bz2
gentoo-2-082199328bf1cd122e0d0957702c1895d6a7d207.zip
pay attention to empty my.cnf
Diffstat (limited to 'eclass')
-rw-r--r--eclass/php-common-r1.eclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/php-common-r1.eclass b/eclass/php-common-r1.eclass
index a323163db934..2349bc1ad972 100644
--- a/eclass/php-common-r1.eclass
+++ b/eclass/php-common-r1.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/php-common-r1.eclass,v 1.9 2007/03/05 01:50:47 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.10 2007/08/27 11:17:32 jokey Exp $
# ========================================================================
#
@@ -228,6 +228,11 @@ php_check_pgsql() {
# ========================================================================
php_get_mycnf_charset() {
+ # nothing todo if no mysql installed
+ if [[ ! -f "${ROOT}/etc/mysql/my.cnf" ]]; then
+ echo "empty"
+ return
+ fi
local sapi="${1}"
local section=""
local client_charset=""