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/sources_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/sources_command.rb')
-rw-r--r-- | lib/rubygems/commands/sources_command.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb index a5f2d022c6..5a8f5af9c3 100644 --- a/lib/rubygems/commands/sources_command.rb +++ b/lib/rubygems/commands/sources_command.rb @@ -82,7 +82,7 @@ Do you want to add this source? def check_rubygems_https(source_uri) # :nodoc: uri = URI source_uri - if uri.scheme and uri.scheme.downcase == "http" and + if uri.scheme && uri.scheme.downcase == "http" && uri.host.downcase == "rubygems.org" question = <<-QUESTION.chomp https://rubygems.org is recommended for security over #{uri} @@ -215,9 +215,9 @@ To remove a source use the --remove argument: def remove_cache_file(desc, path) # :nodoc: FileUtils.rm_rf path - if not File.exist?(path) + if !File.exist?(path) say "*** Removed #{desc} source cache ***" - elsif not File.writable?(path) + elsif !File.writable?(path) say "*** Unable to remove #{desc} source cache (write protected) ***" else say "*** Unable to remove #{desc} source cache ***" |