Use reject! and map.flatten(1) for Ruby 1.8.7 supportseg-conflict-minimal-dependencies

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index d463672a0c..db2ae496a4 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -23,12 +23,12 @@ module Bundler
           o << %(  In Gemfile:\n)
           trees = conflict.requirement_trees
 
-          maximal = 1.upto(trees.size).flat_map do |size|
-            trees.flat_map(&:last).combination(size).to_a
-          end.select do |deps|
+          maximal = 1.upto(trees.size).map do |size|
+            trees.map(&:last).flatten(1).combination(size).to_a
+          end.flatten(1).select do |deps|
             Bundler::VersionRanges.empty?(*Bundler::VersionRanges.for_many(deps.map(&:requirement)))
           end.min_by(&:size)
-          trees.select! {|t| maximal.include?(t.last) } if maximal
+          trees.reject! {|t| !maximal.include?(t.last) } if maximal
 
           o << trees.sort_by {|t| t.reverse.map(&:name) }.map do |tree|
             t = String.new