diff options
author | The Bundler Bot <bot@bundler.io> | 2017-08-28 15:36:19 +0000 |
---|---|---|
committer | The Bundler Bot <bot@bundler.io> | 2017-08-28 15:36:19 +0000 |
commit | b0a1cabc5eaa4b5386c9a86e39abcbeaf72aaf3f (patch) | |
tree | bdbe103543b9cff5dd15eb466ae91a9effe18c84 | |
parent | cda5ef70e2b07d5d78168b34eeeb9dc86df78894 (diff) | |
parent | 4d69eb413294c3c548c9f522a2dd45003d6686ac (diff) | |
download | bundler-b0a1cabc5eaa4b5386c9a86e39abcbeaf72aaf3f.tar.gz |
Auto merge of #5973 - bundler:seg-molinillo-0.6.2, r=segiddins
Update Molinillo to 0.6.2
### What was the end-user problem that led to this PR?
The problem was Molinillo 0.6.2 fixes a potential problem.
### What is your fix for the problem, implemented in this PR?
My fix is to update to Molinillo 0.6.2.
-rw-r--r-- | lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb | 2 | ||||
-rw-r--r-- | lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb index a681231f1a..17ed085673 100644 --- a/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb +++ b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb @@ -2,5 +2,5 @@ module Bundler::Molinillo # The version of Bundler::Molinillo. - VERSION = '0.6.1'.freeze + VERSION = '0.6.2'.freeze end diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb index c63bdb5ac4..d5a181ea14 100644 --- a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb @@ -791,24 +791,25 @@ module Bundler::Molinillo end # Build an array of PossibilitySets, with each element representing a group of - # dependency versions that all have the same sub-dependency version constraints. + # dependency versions that all have the same sub-dependency version constraints + # and are contiguous. # @param [Array] an array of possibilities # @return [Array] an array of possibility sets def group_possibilities(possibilities) possibility_sets = [] - possibility_sets_index = {} + current_possibility_set = nil possibilities.reverse_each do |possibility| dependencies = dependencies_for(possibility) - if index = possibility_sets_index[dependencies] - possibility_sets[index].possibilities.unshift(possibility) + if current_possibility_set && current_possibility_set.dependencies == dependencies + current_possibility_set.possibilities.unshift(possibility) else - possibility_sets << PossibilitySet.new(dependencies, [possibility]) - possibility_sets_index[dependencies] = possibility_sets.count - 1 + possibility_sets.unshift(PossibilitySet.new(dependencies, [possibility])) + current_possibility_set = possibility_sets.first end end - possibility_sets.reverse + possibility_sets end # Pushes a new {DependencyState}. |