diff options
| author | Hiroshi SHIBATA <[email protected]> | 2022-08-09 11:16:07 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2022-08-09 12:05:19 +0900 |
| commit | 44264b4fee1e208e759710c39271186ff9856b40 (patch) | |
| tree | 939a9810293c86553e7b600bce9fb426776f6000 /lib/rubygems/commands/update_command.rb | |
| parent | f8936b3341376948112e31f9e9b0cb3ad6e91e7c (diff) | |
Merge rubygems/bundler HEAD.
Pick from https://github.com/rubygems/rubygems/commit/dfbb5a38114640e0d8d616861607f3de73ee0199
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6224
Diffstat (limited to 'lib/rubygems/commands/update_command.rb')
| -rw-r--r-- | lib/rubygems/commands/update_command.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb index a079642669..7c24fedcde 100644 --- a/lib/rubygems/commands/update_command.rb +++ b/lib/rubygems/commands/update_command.rb @@ -56,7 +56,7 @@ class Gem::Commands::UpdateCommand < Gem::Command def defaults_str # :nodoc: "--no-force --install-dir #{Gem.dir}\n" + - install_update_defaults_str + install_update_defaults_str end def description # :nodoc: @@ -155,7 +155,7 @@ command to remove old versions. Gem::Specification.dirs = Gem.user_dir if options[:user_install] Gem::Specification.each do |spec| - if hig[spec.name].nil? or hig[spec.name].version < spec.version + if hig[spec.name].nil? || hig[spec.name].version < spec.version hig[spec.name] = spec end end @@ -292,8 +292,8 @@ command to remove old versions. args << "--no-document" unless options[:document].include?("rdoc") || options[:document].include?("ri") args << "--no-format-executable" if options[:no_format_executable] args << "--previous-version" << Gem::VERSION if - options[:system] == true or - Gem::Version.new(options[:system]) >= Gem::Version.new(2) + options[:system] == true || + Gem::Version.new(options[:system]) >= Gem::Version.new(2) args end @@ -301,7 +301,7 @@ command to remove old versions. result = [] highest_installed_gems.each do |l_name, l_spec| - next if not gem_names.empty? and + next if !gem_names.empty? && gem_names.none? {|name| name == l_spec.name } highest_remote_tup = highest_remote_name_tuple l_spec |