diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 23:28:35 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 23:28:35 +0000 |
| commit | 68ab369dd714aecfb47ea49477a9edb0fc37d1d4 (patch) | |
| tree | 2221e497df9cf17636fab3f3b3734903e753285b /lib | |
| parent | 7ed3addd78dd7ad3ecc9fc3f55e0d6010571379e (diff) | |
| download | ruby-68ab369dd714aecfb47ea49477a9edb0fc37d1d4.tar.gz ruby-68ab369dd714aecfb47ea49477a9edb0fc37d1d4.tar.xz ruby-68ab369dd714aecfb47ea49477a9edb0fc37d1d4.zip | |
Fix some test failures in RubyGems.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index cc8066858..e25e05a3b 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -345,9 +345,15 @@ module Gem end sitelibdir = ConfigMap[:sitelibdir] + sitelibdir_index = $LOAD_PATH.index sitelibdir - # gem directories must come after -I and ENV['RUBYLIB'] - $:.insert($:.index(sitelibdir), *require_paths) + if sitelibdir_index then + # gem directories must come after -I and ENV['RUBYLIB'] + $LOAD_PATH.insert(sitelibdir_index, *require_paths) + else + # we are probably testing in core, -I and RUBYLIB don't apply + $LOAD_PATH.unshift(*require_paths) + end # Now autorequire if autorequire && spec.autorequire then # DEPRECATED |