archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

merge revision(s) 39731: [Backport #7991]

Browse source 
* 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:
nagachika 2013-03-17 15:13:08 +00:00
parent cd1d342286
commit d32d8b33b7
13 changed files with 83 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/rubygems/commands/setup_command.rb
View file

@ -437,13 +437,18 @@ abort "#{deprecation_message}"
end
def remove_old_lib_files lib_dir
lib_files = rb_files_in 'lib'
rubygems_dir = File.join lib_dir, 'rubygems'
lib_files = rb_files_in 'lib/rubygems'
old_lib_files = rb_files_in lib_dir
old_lib_files = rb_files_in rubygems_dir
to_remove = old_lib_files - lib_files
Dir.chdir lib_dir do
to_remove.delete_if do |file|
file.start_with? 'defaults'
end
Dir.chdir rubygems_dir do
to_remove.each do |file|
FileUtils.rm_f file