diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-02 05:15:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-02 05:15:53 +0000 |
| commit | e282a932440608a0cd7be73c0604428fe699e5b5 (patch) | |
| tree | 687ccabd522053bcc546b61d62a565b2a7df2bcd /lib/rubygems | |
| parent | 3acebabd38774e0902b3cbc4c3409d87bde13c7e (diff) | |
| download | ruby-e282a932440608a0cd7be73c0604428fe699e5b5.tar.gz | |
rubygems.rb: use @gem_prelude_index
* lib/rubygems.rb (Gem.load_path_insert_index): search
@gem_prelude_index first.
* lib/rubygems/test_case.rb (Gem::TestCase#setup): keep already
expanded paths to prserve instance variables.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/test_case.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index aee4b75773..9edb6b48bd 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -269,7 +269,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase Gem.ensure_gem_subdirectories @gemhome @orig_LOAD_PATH = $LOAD_PATH.dup - $LOAD_PATH.map! { |s| File.expand_path(s).untaint } + $LOAD_PATH.map! { |s| + (expand_path = File.expand_path(s)) == s ? s : expand_path.untaint + } Dir.chdir @tempdir |