summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-04-05 00:43:26 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-04-05 00:43:26 +0000
commite8ddb41e671f8c1fcdc097798d57b72cd8b693ba (patch)
tree3b883961157193449ab821c804511027cd413c2b /eclass/mysql.eclass
parentDelete old ebuilds. (diff)
downloadgentoo-2-e8ddb41e671f8c1fcdc097798d57b72cd8b693ba.tar.gz
gentoo-2-e8ddb41e671f8c1fcdc097798d57b72cd8b693ba.tar.bz2
gentoo-2-e8ddb41e671f8c1fcdc097798d57b72cd8b693ba.zip
Use the last instance of datadir if we fall to manually processing.
Diffstat (limited to 'eclass/mysql.eclass')
-rw-r--r--eclass/mysql.eclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 9a7713b5fb87..8d2ede30a2ac 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.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/mysql.eclass,v 1.88 2008/03/10 02:47:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.89 2008/04/05 00:43:26 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -226,7 +226,8 @@ mysql_init_vars() {
| tail -n1`
if [[ -z "${MY_DATADIR}" ]] ; then
MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
- | sed -e 's/.*=\s*//'`
+ | sed -e 's/.*=\s*//' \
+ | tail -n1`
fi
fi
if [[ -z "${MY_DATADIR}" ]] ; then