summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2012-04-22 09:28:07 +0000
committerHans de Graaff <graaff@gentoo.org>2012-04-22 09:28:07 +0000
commit2de1c4669ee06f167f78912e513f50ff51741a71 (patch)
tree781055602a8de99b34ed54004944bc03c5ce77c4 /dev-ruby
parentVersion bump. Fixes security bug 412901. (diff)
downloadgentoo-2-2de1c4669ee06f167f78912e513f50ff51741a71.tar.gz
gentoo-2-2de1c4669ee06f167f78912e513f50ff51741a71.tar.bz2
gentoo-2-2de1c4669ee06f167f78912e513f50ff51741a71.zip
Check for userpriv feature before running tests, fixing bug 408951.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/rubygems/ChangeLog5
-rw-r--r--dev-ruby/rubygems/rubygems-1.8.23.ebuild25
2 files changed, 19 insertions, 11 deletions
diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index 00724d06759f..448965664714 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/rubygems
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.186 2012/04/22 09:10:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.187 2012/04/22 09:28:07 graaff Exp $
+
+ 22 Apr 2012; Hans de Graaff <graaff@gentoo.org> rubygems-1.8.23.ebuild:
+ Check for userpriv feature before running tests, fixing bug 408951.
*rubygems-1.8.23 (22 Apr 2012)
diff --git a/dev-ruby/rubygems/rubygems-1.8.23.ebuild b/dev-ruby/rubygems/rubygems-1.8.23.ebuild
index 1397c4d9d591..91f79d56e5d3 100644
--- a/dev-ruby/rubygems/rubygems-1.8.23.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.8.23.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.8.23.ebuild,v 1.1 2012/04/22 09:10:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.8.23.ebuild,v 1.2 2012/04/22 09:28:07 graaff Exp $
EAPI="4"
@@ -58,15 +58,20 @@ each_ruby_test() {
# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
unset RUBYOPT
- case ${RUBY} in
- *jruby)
- eqawarn "Skipping tests for jruby 1.5."
- ;;
- *)
- RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
- -e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
- ;;
- esac
+ if [[ "${EUID}" -ne "0" ]]; then
+ case ${RUBY} in
+ *jruby)
+ eqawarn "Skipping tests for jruby 1.5."
+ ;;
+ *)
+ RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
+ -e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+ ;;
+ esac
+ else
+ ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+ eerror "Testsuite will not be run."
+ fi
}
each_ruby_install() {