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

[Robin H. Johnson (robbat2)]

robbat2     07/11/08 09:42:56

  Modified:             mysql.eclass
  Log:
  Add the FEATURES=-userpriv die so that testing fails earlier than src_test.

Revision  Changes    Path
1.83                 eclass/mysql.eclass

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

Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mysql.eclass	2 Oct 2007 10:00:07 -0000	1.82
+++ mysql.eclass	8 Nov 2007 09:42:55 -0000	1.83
@@ -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.82 2007/10/02 10:00:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.83 2007/11/08 09:42:55 robbat2 Exp $
 
 # Author: Francesco Riosa (Retired) <vivo@g.o>
 # Maintainer: Luca Longinotti <chtekk@g.o>
@@ -455,8 +455,13 @@
 #
 
 mysql_pkg_setup() {
-	enewgroup mysql 60 || die "problem adding 'mysql' group"
-	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
+	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"
+			fi
+		fi
+	fi
 
 	# Check for USE flag problems in pkg_setup
 	if use static && use ssl ; then
@@ -478,6 +483,10 @@
 		eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
 		die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
 	fi
+	
+	# This should come after all of the die statements
+	enewgroup mysql 60 || die "problem adding 'mysql' group"
+	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
 
 	mysql_check_version_range "4.0 to 5.0.99.99" \
 	&& use berkdb \



-- 
gentoo-commits@g.o mailing list