diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-09 00:24:55 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-09 00:24:55 +0000 |
| commit | 7f046c653c63e455d208c77b6611c7027ec8447b (patch) | |
| tree | 835467595477b7809a74674d0aac7d609579916a /lib | |
| parent | 35a5e37649ab76db7d42104fc0c709dce2f7f35a (diff) | |
| download | ruby-7f046c653c63e455d208c77b6611c7027ec8447b.tar.gz | |
* lib/rubygems/package/old.rb: Fix behavior only on ruby 1.8.
* lib/rubygems/package.rb: Include checksums.yaml.gz signatures for
verification.
* test/rubygems/test_gem_package.rb: Test for the above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/package.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/package/old.rb | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index 82abcd0c6f..d56316e1ba 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -518,8 +518,6 @@ EOM when /\.sig$/ then @signatures[$`] = entry.read if @security_policy next - when 'checksums.yaml.gz' then - next # already handled else digest entry end diff --git a/lib/rubygems/package/old.rb b/lib/rubygems/package/old.rb index e0bdfbb3dc..d74753fa90 100644 --- a/lib/rubygems/package/old.rb +++ b/lib/rubygems/package/old.rb @@ -23,9 +23,10 @@ class Gem::Package::Old < Gem::Package require 'zlib' Gem.load_yaml - @gem = gem - @contents = nil - @spec = nil + @contents = nil + @gem = gem + @security_policy = nil + @spec = nil end ## @@ -142,7 +143,7 @@ class Gem::Package::Old < Gem::Package end end - yaml_error = if RUBY_VERSION < '1.8' then + yaml_error = if RUBY_VERSION < '1.9' then YAML::ParseError elsif YAML::ENGINE.yamler == 'syck' then YAML::ParseError |