summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-06 16:00:22 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-06 16:00:22 +0000
commitdc976d830b5fd6cdf842cad398a2720865eefad3 (patch)
tree848ac83c48f25eb7820a2d43fab4fbe55e312a8e /eclass
parentAdded examples USE-flag (bug #111508). Dropped old versions. Version bump. (diff)
downloadhistorical-dc976d830b5fd6cdf842cad398a2720865eefad3.tar.gz
historical-dc976d830b5fd6cdf842cad398a2720865eefad3.tar.bz2
historical-dc976d830b5fd6cdf842cad398a2720865eefad3.zip
Don't change the shell options to Portage, or it will fail. Closes bug #160339.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ruby.eclass7
1 files changed, 5 insertions, 2 deletions
diff --git a/eclass/ruby.eclass b/eclass/ruby.eclass
index 9937a16e4d5a..8a2d4a52abac 100644
--- a/eclass/ruby.eclass
+++ b/eclass/ruby.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.55 2006/12/04 22:05:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.56 2007/01/06 16:00:22 flameeyes Exp $
#
# Author: Mamoru KOMACHI <usata@gentoo.org>
#
@@ -228,7 +228,8 @@ prepall() {
elif [ "${USE_RUBY}" == "any" ] ; then
siteruby=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')
# in case no directories found in siteruby
- shopt -sq nullglob
+ local shopts=$-
+ set -o noglob # so that bash doen't expand "*"
for x in ${D}/${siteruby}/* ; do
mv $x ${D}/${siteruby}/..
@@ -236,6 +237,8 @@ prepall() {
if [ -d ${D}${siteruby} ] ; then
rmdir --ignore-fail-on-non-empty ${D}/${siteruby}
fi
+
+ set +noglob; set -$shopts # reset old shell opts
fi
prepallman