diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 15:01:47 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-17 15:01:47 +0000 |
| commit | 3e3f03461b83e8cb3bd6c9033d5f3619ee18bb92 (patch) | |
| tree | dbdc4ee69d27e9f8de00989d6fc36998ca9a696b /lib/rubygems.rb | |
| parent | d1ce1051b9057a1ac76ad87822a56db539efdb8b (diff) | |
merge revision(s) 39606,39609: [Backport #8019]
* lib/rubygems/commands/query_command.rb: Only fetch remote specs when
showing details. [ruby-trunk - Bug #8019] RubyGems bug #487
* lib/rubygems/remote_fetcher.rb: ditto.
* lib/rubygems/security/policy.rb: ditto.
* test/rubygems/test_gem_commands_query_command.rb: Test for the
above.
* lib/rubygems/security.rb: Make OpenSSL optional for RubyGems.
* lib/rubygems/commands/cert_command.rb: ditto.
* lib/rubygems/config_file.rb: Display file with YAML error, not
~/.gemrc
* lib/rubygems/remote_fetcher.rb: Only create gem subdirectories when
installing gems.
* lib/rubygems/dependency_resolver.rb: ditto.
* lib/rubygems/test_utilities.rb: ditto.
* test/rubygems/test_gem_commands_fetch_command.rb: Test for the
above.
* lib/rubygems/spec_fetcher.rb: Only try to upgrade
http://rubygems.org to HTTPS
* test/rubygems/test_gem_spec_fetcher.rb: Test for the above.
* lib/rubygems.rb: Update win_platform? check for JRuby compatibility.
* test/rubygems/test_gem_installer.rb: Update for Ruby 1.9.2
compatibility
* test/rubygems/test_gem_spec_fetcher.rb: Removed unused variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems.rb')
| -rw-r--r-- | lib/rubygems.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 226ff69db5..ac992d09d6 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -895,7 +895,8 @@ module Gem def self.win_platform? if @@win_platform.nil? then - @@win_platform = !!WIN_PATTERNS.find { |r| RUBY_PLATFORM =~ r } + ruby_platform = RbConfig::CONFIG['host_os'] + @@win_platform = !!WIN_PATTERNS.find { |r| ruby_platform =~ r } end @@win_platform |