diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-26 01:12:57 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-26 01:12:57 +0000 |
| commit | f5c8aecebcdde88d088486ba9fed5e3609fd84a7 (patch) | |
| tree | 2d863775b7017d84f2c617c49235641f10b249e3 /lib/rubygems.rb | |
| parent | 322937ff00ce855d66733c5e786cd9d7d4cd71b9 (diff) | |
* backport r33074 from trunk
* lib/rubygems: Update to RubyGems 1.8.10. Fixes security issue in
creating ruby-format gemspecs. Fixes Gem.dir not being at the front
of Gem.path to fix uninstall and cleanup commands. Fixes gem
uninstall stopping on the first missing gem.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems.rb')
| -rw-r--r-- | lib/rubygems.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index f469deb9a8..632b5e0a60 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -118,7 +118,7 @@ require "rubygems/deprecate" # -The RubyGems Team module Gem - VERSION = '1.8.9' + VERSION = '1.8.10' ## # Raised when RubyGems is unable to load or activate a gem. Contains the @@ -644,7 +644,15 @@ module Gem def self.load_yaml begin - require 'psych' + gem 'psych', '~> 1.2', '>= 1.2.1' unless ENV['TEST_SYCK'] + rescue Gem::LoadError + # It's OK if the user does not have the psych gem installed. We will + # attempt to require the stdlib version + end + + begin + # Try requiring the gem version *or* stdlib version of psych. + require 'psych' unless ENV['TEST_SYCK'] rescue ::LoadError ensure require 'yaml' |