lib/bundler/patch/conservative_resolver.rb in bundler-patch-0.7.1 vs lib/bundler/patch/conservative_resolver.rb in bundler-patch-0.7.2

- old
+ new

@@ -15,10 +15,12 @@ def search_for(dependency) res = super(dependency) dep = dependency.dep unless dependency.is_a? Gem::Dependency + STDERR.puts "super search_for: #{debug_format_result(dep, res).inspect}" if ENV['DEBUG_RESOLVER'] + @conservative_search_for ||= {} res = @conservative_search_for[dep] ||= begin gem_name = dep.name # An Array per version returned, different entries for different platforms. @@ -26,10 +28,10 @@ locked_spec = @locked_specs[gem_name].first (@strict ? filter_specs(res, locked_spec) : sort_specs(res, locked_spec)).tap do |res| - STDERR.puts debug_format_result(dep, res).inspect if ENV['DEBUG_PATCH_RESOLVER'] + STDERR.puts "after search_for: #{debug_format_result(dep, res).inspect}" if ENV['DEBUG_PATCH_RESOLVER'] end end # dup is important, in weird (large) cases Bundler will empty the result array corrupting the cache. # Bundler itself doesn't have this problem because the super search_for does a select on its cached