diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-04 13:36:46 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-04 13:36:46 +0000 |
| commit | 7455071a4f678c8926f397e5c4294879c51a130d (patch) | |
| tree | 2322d7037d2302705345c6b0a52baa9f37a20ddc /lib | |
| parent | 185e9ae27c9bc441ddadd73a55f7c262021aee57 (diff) | |
merges r20085 from trunk into ruby_1_9_1.
* Don't require rubygems/defaults from gem_prelude.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems.rb | 1 | ||||
| -rw-r--r-- | lib/rubygems/defaults.rb | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index e85d97c003..9913b59ce1 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -718,6 +718,7 @@ module Gem @gem_path.uniq! @gem_path.each do |path| if 0 == File.expand_path(path).index(Gem.user_home) + next unless File.directory? Gem.user_home unless win_platform? then # only create by matching user next if Etc.getpwuid.uid != File::Stat.new(Gem.user_home).uid diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index 315d12a484..7884fad83d 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -20,9 +20,12 @@ module Gem if defined? RUBY_FRAMEWORK_VERSION then File.join File.dirname(ConfigMap[:sitedir]), 'Gems', ConfigMap[:ruby_version] - else + elsif RUBY_VERSION > '1.9' then File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems', ConfigMap[:ruby_version]) + else + File.join(ConfigMap[:libdir], ruby_engine, 'gems', + ConfigMap[:ruby_version]) end end |