aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rubygems/package.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-27 23:20:57 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-27 23:20:57 +0000
commita6c92a85e418dd9b748e37d0f4445784ad1e9c71 (patch)
tree057b304a1e5c55162104eec3c387cd81c7a84460 /lib/rubygems/package.rb
parent4e040aa6ac4cc4f3b00007b8635a990ef36526c4 (diff)
downloadruby-a6c92a85e418dd9b748e37d0f4445784ad1e9c71.tar.gz
* lib/rubygems/available_set.rb: Undent for style
* lib/rubygems/dependency_installer.rb: Pick latest prerelease gem to install. Fixes RubyGems bug #468. * test/rubygems/test_gem_dependency_installer.rb: Test for the above. * lib/rubygems/dependency_installer.rb: Don't display "Done installing documentation" if documentation will not be installed. * lib/rubygems/rdoc.rb: ditto * lib/rubygems/dependency_list.rb: Use Array#concat for Ruby 1.x performance. * lib/rubygems/installer.rb: Use formatted program name when comparing executables. RubyGems pull request #471 * test/rubygems/test_gem_installer.rb: Test for the above. * lib/rubygems/package.rb: Use more explicit feature check to work around JRuby bug #552 * lib/rubygems/ssl_certs/GeoTrust_Global_CA.pem: Added GeoTrust root certificate. * test/rubygems/test_gem_source_list.rb: Use "example" instead of real hostname git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/package.rb')
-rw-r--r--lib/rubygems/package.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
index d56316e1ba..301eef48cc 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -387,8 +387,8 @@ EOM
@spec = Gem::Specification.from_yaml entry.read
when 'metadata.gz' then
args = [entry]
- args << { :external_encoding => Encoding::UTF_8 } if
- Object.const_defined? :Encoding
+ args << { :external_encoding => Encoding::UTF_8 } unless
+ Zlib::GzipReader.method(:wrap).arity == 1
Zlib::GzipReader.wrap(*args) do |gzio|
@spec = Gem::Specification.from_yaml gzio.read