diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2021-09-29 20:53:29 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2021-10-13 21:16:40 +0900 |
| commit | d1e6f2226bccebaf5dfd20d64b794d3caa08e52f (patch) | |
| tree | eb96d65b02ced12ea02d0f6e62b60d5bb6deaffc /lib | |
| parent | ec5f732b7d48b557c9d8974709f7175bd9f99323 (diff) | |
[rubygems/rubygems] No need to use converged dependencies either
This is exclusively about the lockfile.
https://github.com/rubygems/rubygems/commit/d6c6d040cd
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 96c7c862d7..e50266f5a2 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -762,7 +762,7 @@ module Bundler end resolve = SpecSet.new(converged) - @locked_specs_incomplete_for_platform = !@locked_specs.for(expand_dependencies(requested_dependencies & deps), true, true) + @locked_specs_incomplete_for_platform = !@locked_specs.for(expand_dependencies(requested_dependencies & locked_dependencies), true, true) resolve = SpecSet.new(resolve.for(expand_dependencies(deps, true), false, false).reject{|s| @unlock[:gems].include?(s.name) }) diff = nil |