diff options
Diffstat (limited to 'lib/bundler/definition.rb')
-rw-r--r-- | lib/bundler/definition.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 8bd9e11f32..79369ec374 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -485,7 +485,7 @@ module Bundler @resolver ||= begin last_resolve = converge_locked_specs remove_ruby_from_platforms_if_necessary!(dependencies) - Resolver.new(source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve, platforms) + Resolver.new(source_requirements, last_resolve, gem_version_promoter, additional_base_requirements_for_resolve(last_resolve), platforms) end end @@ -878,9 +878,9 @@ module Bundler end end - def additional_base_requirements_for_resolve + def additional_base_requirements_for_resolve(last_resolve) return [] unless @locked_gems && unlocking? && !sources.expired_sources?(@locked_gems.sources) - converge_specs(@originally_locked_specs).map do |locked_spec| + converge_specs(@originally_locked_specs - last_resolve).map do |locked_spec| Dependency.new(locked_spec.name, ">= #{locked_spec.version}") end.uniq end |