summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-05-29 03:15:12 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-05-29 03:15:12 +0000
commit11a3105f66d8c6fc023ecf17dfc9043f8624c2de (patch)
treeaee1c3fc6c3f1101726811c0b2224e5285a28a4d /eclass
parentversion bump from upstream (diff)
downloadhistorical-11a3105f66d8c6fc023ecf17dfc9043f8624c2de.tar.gz
historical-11a3105f66d8c6fc023ecf17dfc9043f8624c2de.tar.bz2
historical-11a3105f66d8c6fc023ecf17dfc9043f8624c2de.zip
Bug #187024. Test for what user we are instead of FEATURES=userpriv. MySQL tests WILL fail if we are root.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/mysql.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 9fd16a7c99a1..7665cc05ca47 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.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@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -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