From e8ddb41e671f8c1fcdc097798d57b72cd8b693ba Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 5 Apr 2008 00:43:26 +0000 Subject: Use the last instance of datadir if we fall to manually processing. --- eclass/mysql.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'eclass') 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) # Maintainer: MySQL Team @@ -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 -- cgit v1.2.3-65-gdbad