diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-06-26 16:42:38 +0200 |
|---|---|---|
| committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-06-26 16:42:38 +0200 |
| commit | 7d27330fc775fbde9bf189ae4a775e5ddf1fdb04 (patch) | |
| tree | 38209f47a171f8b7cd2850744c42e6ce956cffc7 | |
| parent | 7da2bf75f506756d860ecca9d3501a01556e1054 (diff) | |
| download | bundler-fix_reresolving_locked_platform_specific_deps.tar.gz | |
Inline `expanded_deps`fix_reresolving_locked_platform_specific_deps
It's now only used once, and doing it like this is consistent with the
previous line.
| -rw-r--r-- | lib/bundler/definition.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 079f3ddbb5..339c38ab72 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -812,9 +812,8 @@ module Bundler end resolve = SpecSet.new(converged) - expanded_deps = expand_dependencies(deps, true) @locked_specs_incomplete_for_platform = !resolve.for(expand_dependencies(deps), @unlock[:gems], true, true) - resolve = resolve.for(expanded_deps, @unlock[:gems], false, false, false) + resolve = resolve.for(expand_dependencies(deps, true), @unlock[:gems], false, false, false) diff = nil # Now, we unlock any sources that do not have anymore gems pinned to it |