diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-14 12:59:03 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-14 12:59:03 +0000 |
| commit | 4ae3df42f723d25b0fe4ba6b2689d607b01c6f48 (patch) | |
| tree | 26c5f5cf033f79373e63b10f684df07898b7cd8f /lib/rubygems/dependency_installer.rb | |
| parent | d1e6304a891fc5e9cc63e50520bdc798fb95b829 (diff) | |
Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c
This version contains the some style changes by RuboCop.
* https://github.com/rubygems/rubygems/commit/9d810be0ede925fb2e3af535848582c3f8e0e72f
* https://github.com/rubygems/rubygems/commit/61ea98a727fb1b76b6fac52d74107ee4b02aaef2
* https://github.com/rubygems/rubygems/commit/795893dce3c5f8540804fc08144cc6a90f086b13
* https://github.com/rubygems/rubygems/commit/9be7858f7f17eae3058204f3c03e4b798ba18b9c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency_installer.rb')
| -rw-r--r-- | lib/rubygems/dependency_installer.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index 346208603c..7f4f914591 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -29,7 +29,7 @@ class Gem::DependencyInstaller :wrappers => true, :build_args => nil, :build_docs_in_background => false, - :install_as_default => false + :install_as_default => false }.freeze ## @@ -336,15 +336,15 @@ class Gem::DependencyInstaller # REFACTOR maybe abstract away using Gem::Specification.include? so # that this isn't dependent only on the currently installed gems - dependency_list.specs.reject! { |spec| + dependency_list.specs.reject! do |spec| not keep_names.include?(spec.full_name) and Gem::Specification.include?(spec) - } + end unless dependency_list.ok? or @ignore_dependencies or @force - reason = dependency_list.why_not_ok?.map { |k,v| + reason = dependency_list.why_not_ok?.map do |k,v| "#{k} requires #{v.join(", ")}" - }.join("; ") + end.join("; ") raise Gem::DependencyError, "Unable to resolve dependencies: #{reason}" end |