mirror of
https://github.com/ruby/ruby.git
synced 2025-09-18 01:54:00 +02:00
merge revision(s) 39731: [Backport #7991]
* lib/rubygems/commands/setup_command.rb: Don't delete non-rubygems files when installing RubyGems. * test/rubygems/test_gem_commands_setup_command.rb: Test for the above. * lib/rubygems/ext/ext_conf_builder.rb: Use full path to siteconf.rb in case the extconf.rb changes directories (like memcached does). * lib/rubygems/package.rb: Remove double slash from path. * test/rubygems/test_gem_package.rb: Test for the above. * test/rubygems/test_gem_package_old.rb: ditto. * lib/rubygems/source.rb: Revert automatic HTTPS upgrade * lib/rubygems/spec_fetcher.rb: ditto. * test/rubygems/test_gem_remote_fetcher.rb: ditto. * test/rubygems/test_gem_source.rb: ditto. * test/rubygems/test_gem_spec_fetcher.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cd1d342286
commit
d32d8b33b7
13 changed files with 83 additions and 153 deletions
|
@ -141,14 +141,4 @@ class Gem::Source
|
|||
fetcher = Gem::RemoteFetcher.fetcher
|
||||
fetcher.download spec, @uri.to_s, dir
|
||||
end
|
||||
|
||||
##
|
||||
# Replaces the URI for this source with +uri+. Used for upgrading this
|
||||
# source to HTTPS
|
||||
|
||||
def uri= uri # :nodoc:
|
||||
@api_uri = nil
|
||||
@uri = uri
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue