summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-05-29 19:35:51 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-05-29 19:35:51 +0000
commitb4ced880b15805fe6e236e4730c9f8f7bfbd66de (patch)
treee5b5b8d44f37c5ebe8a2bec78d37e0ab54cc8c6e /eclass/mysql.eclass
parentFix depend on openresolv, since resolvconf-gentoo is masked (diff)
downloadgentoo-2-b4ced880b15805fe6e236e4730c9f8f7bfbd66de.tar.gz
gentoo-2-b4ced880b15805fe6e236e4730c9f8f7bfbd66de.tar.bz2
gentoo-2-b4ced880b15805fe6e236e4730c9f8f7bfbd66de.zip
Make FEATURES=-userpriv test non-fatal during pkg_setup, as portage always runs pkg_setup as root, so we cannot detect FEATURES=-userpriv by using UID.
Diffstat (limited to 'eclass/mysql.eclass')
-rw-r--r--eclass/mysql.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index f0ed1ca362c0..56a77745d16b 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.95 2008/05/29 05:38:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.96 2008/05/29 19:35:51 robbat2 Exp $
# Author: Francesco Riosa (Retired) <vivo@gentoo.org>
# Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -471,7 +471,7 @@ mysql_pkg_setup() {
if hasq test ${FEATURES} ; then
if ! use minimal ; then
if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
fi
fi
fi