archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-21 11:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge RubyGems-3.3.20 and Bundler-2.3.20

Browse source
This commit is contained in:
Hiroshi SHIBATA 2022-08-22 11:50:00 +09:00 • committed by nagachika
parent 44c926f3a9
commit 522b75f1b6
135 changed files with 1131 additions and 613 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -329,9 +329,9 @@ By default, this RubyGems will install gem as:
# ignore
end
if File.writable? gem_doc_dir and
(not File.exist? rubygems_doc_dir or
File.writable? rubygems_doc_dir)
if File.writable?(gem_doc_dir) &&
(!File.exist?(rubygems_doc_dir) ||
File.writable?(rubygems_doc_dir))
say "Removing old RubyGems RDoc and ri" if @verbose
Dir[File.join(Gem.dir, "doc", "rubygems-[0-9]*")].each do |dir|
rm_rf dir
@ -559,7 +559,7 @@ abort "#{deprecation_message}"
history_string = ""
until versions.length == 0 or
until versions.length == 0 ||
versions.shift <= options[:previous_version] do
history_string += version_lines.shift + text.shift
end