summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2022-07-06 22:21:32 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2022-10-18 16:33:15 +0900
commit8c4bd1e58d426ff014a3958ac197d40b4e367f00 (patch)
tree7a48075ce1f51b312e936f8e1702c258558be4fd
parent60670b163f32cae27629c852f95870656d2ee72f (diff)
downloadruby-8c4bd1e58d426ff014a3958ac197d40b4e367f00.tar.gz
[rubygems/rubygems] Remove another `expand_dependencies` instance
https://github.com/rubygems/rubygems/commit/33769ddb07
-rw-r--r--lib/bundler/definition.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index a289babcb3..6537ba1de8 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -224,7 +224,7 @@ module Bundler
def current_dependencies
dependencies.select do |d|
- d.should_include? && !d.gem_platforms(@platforms).empty?
+ d.should_include? && !d.gem_platforms([generic_local_platform]).empty?
end
end
@@ -248,10 +248,9 @@ module Bundler
def dependencies_for(groups)
groups.map!(&:to_sym)
- deps = current_dependencies.reject do |d|
+ current_dependencies.reject do |d|
(d.groups & groups).empty?
end
- expand_dependencies(deps)
end
# Resolve all the dependencies specified in Gemfile. It ensures that