diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-09-06 16:01:28 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-09-06 16:01:28 -0500 |
| commit | 70ee23fb5d03a6d7140ff706eef999ad93bdaf3b (patch) | |
| tree | 7a400253bc1e35a8d13dd6a6f2368320ca6f9765 | |
| parent | dbb0aede6f16e1a252f9a49b48673bfc30bd1242 (diff) | |
| download | bundler-seg-molinillo-0-6-3.tar.gz | |
Update vendored Molinillo to 0.6.3seg-molinillo-0-6-3
| -rw-r--r-- | lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb b/lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb index 17ed085673..72af318831 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.2'.freeze + VERSION = '0.6.3'.freeze end diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb index d5a181ea14..b038d5dcdf 100644 --- a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb @@ -461,11 +461,15 @@ module Bundler::Molinillo # @param [UnwindDetails] details of the conflict just unwound from # @return [void] def filter_possibilities_for_primary_unwind(unwind_details) - all_requirements = unwind_details.conflicting_requirements + unwinds_to_state = unused_unwind_options.select { |uw| uw.state_index == unwind_details.state_index } + unwinds_to_state << unwind_details + unwind_requirement_sets = unwinds_to_state.map(&:conflicting_requirements) state.possibilities.reject! do |possibility_set| possibility_set.possibilities.none? do |poss| - possibility_satisfies_requirements?(poss, all_requirements) + unwind_requirement_sets.any? do |requirements| + possibility_satisfies_requirements?(poss, requirements) + end end end end |