diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-08-09 11:16:07 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-08-09 12:05:19 +0900 |
commit | 44264b4fee1e208e759710c39271186ff9856b40 (patch) | |
tree | 939a9810293c86553e7b600bce9fb426776f6000 /lib/rubygems/exceptions.rb | |
parent | f8936b3341376948112e31f9e9b0cb3ad6e91e7c (diff) | |
download | ruby-44264b4fee1e208e759710c39271186ff9856b40.tar.gz |
Merge rubygems/bundler HEAD.
Pick from https://github.com/rubygems/rubygems/commit/dfbb5a38114640e0d8d616861607f3de73ee0199
Diffstat (limited to 'lib/rubygems/exceptions.rb')
-rw-r--r-- | lib/rubygems/exceptions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb index 48964b10d9..ca4fbb20de 100644 --- a/lib/rubygems/exceptions.rb +++ b/lib/rubygems/exceptions.rb @@ -252,7 +252,7 @@ class Gem::UnsatisfiableDependencyError < Gem::DependencyError # Gem::Resolver::DependencyRequest +dep+ def initialize(dep, platform_mismatch=nil) - if platform_mismatch and !platform_mismatch.empty? + if platform_mismatch && !platform_mismatch.empty? plats = platform_mismatch.map {|x| x.platform.to_s }.sort.uniq super "Unable to resolve dependency: No match for '#{dep}' on this platform. Found: #{plats.join(', ')}" else |