From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JhwVF-0002AL-7P for garchives@archives.gentoo.org; Sat, 05 Apr 2008 00:43:29 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5806BE04A7; Sat, 5 Apr 2008 00:43:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3726AE04A7 for ; Sat, 5 Apr 2008 00:43:28 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id CEB9C663FF for ; Sat, 5 Apr 2008 00:43:27 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JhwVC-0002LH-QD for gentoo-commits@lists.gentoo.org; Sat, 05 Apr 2008 00:43:26 +0000 From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: mysql.eclass X-VCS-Directories: eclass X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: Sender: "Robin H. Johnson" Date: Sat, 05 Apr 2008 00:43:26 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b76649ba-3f0c-4191-9a82-88d19ee6e09b X-Archives-Hash: 8204e176fddbbd9421894f802643a6e1 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.eclas= s?rev=3D1.89&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?rev=3D1.89&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?r1=3D1.88&r2=3D1.89 Index: mysql.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 $ =20 # Author: Francesco Riosa (Retired) # Maintainer: MySQL Team @@ -226,7 +226,8 @@ mysql_init_vars() { | tail -n1` if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR=3D`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ - | sed -e 's/.*=3D\s*//'` + | sed -e 's/.*=3D\s*//' \ + | tail -n1` fi fi if [[ -z "${MY_DATADIR}" ]] ; then --=20 gentoo-commits@lists.gentoo.org mailing list