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

[Robin H. Johnson (robbat2)]

robbat2     08/05/29 03:15:12

  Modified:             mysql.eclass
  Log:
  Bug #187024. Test for what user we are instead of FEATURES=userpriv. MySQL tests WILL fail if we are root.

Revision  Changes    Path
1.91                 eclass/mysql.eclass

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

Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -p -w -b -B -u -u -r1.90 -r1.91
--- mysql.eclass	22 May 2008 18:13:33 -0000	1.90
+++ mysql.eclass	29 May 2008 03:15:12 -0000	1.91
@@ -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.90 2008/05/22 18:13:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.91 2008/05/29 03:15:12 robbat2 Exp $
 
 # Author: Francesco Riosa (Retired) <vivo@g.o>
 # Maintainer: MySQL Team <mysql-bugs@g.o>
@@ -469,8 +469,8 @@ pbxt_src_install() {
 mysql_pkg_setup() {
 	if hasq test ${FEATURES} ; then
 		if ! use minimal ; then
-			if ! hasq userpriv ${FEATURES} ; then
-				die "Testing with FEATURES=-userpriv is no longer supported by upstream"
+			if [[ $UID -eq 0 ]]; then
+				die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
 			fi
 		fi
 	fi



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