[gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass

[Robin H. Johnson (robbat2)]

robbat2     08/04/05 00:43:26

  Modified:             mysql.eclass
  Log:
  Use the last instance of datadir if we fall to manually processing.

Revision  Changes    Path
1.89                 eclass/mysql.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.88&r2=1.89

Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -p -w -b -B -u -u -r1.88 -r1.89
--- mysql.eclass	10 Mar 2008 02:47:20 -0000	1.88
+++ mysql.eclass	5 Apr 2008 00:43:26 -0000	1.89
@@ -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@g.o>
 # Maintainer: MySQL Team <mysql-bugs@g.o>
@@ -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



-- 
gentoo-commits@l.g.o mailing list