diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 0ab0451695..7d28375bb5 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -715,7 +715,9 @@ module Bundler # commonly happen if the Gemfile has changed since the lockfile was last # generated def converge_locked_specs - resolve = converge_specs(@locked_specs) + converged = converge_specs(@locked_specs) + + resolve = SpecSet.new(converged.reject {|s| @unlock[:gems].include?(s.name) }) diff = nil @@ -788,7 +790,7 @@ module Bundler end end - SpecSet.new(filter_specs(converged, deps).reject {|s| @unlock[:gems].include?(s.name) }) + filter_specs(converged, deps) end def metadata_dependencies |
