Skip to content

C
cocoapods
Commit 36b46b29 authored by arida's avatar arida Committed by Ben Asher
Browse files
Options

Fix the problem of travis(https://travis-ci.org/CocoaPods/CocoaPods/jobs/140974410#L3353-L3360).

parent 494442bb
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
lib/cocoapods/resolver.rb
View file @ 36b46b29
...@@ -473,7 +473,6 @@ module Pod ...@@ -473,7 +473,6 @@ module Pod
# dependencies for `target`. # dependencies for `target`.
# #
def valid_dependencies_for_target_from_node(target, cached_dependencys, node) def valid_dependencies_for_target_from_node(target, cached_dependencys, node)
cache_dependency = cached_dependencys[node.name] cache_dependency = cached_dependencys[node.name]
if cache_dependency if cache_dependency
...@@ -485,11 +484,10 @@ module Pod ...@@ -485,11 +484,10 @@ module Pod
edge_is_valid_for_target?(edge, target) edge_is_valid_for_target?(edge, target)
end.map(&:destination) end.map(&:destination)
dependency_nodes + dependency_nodes.flat_map do |node| dependency_nodes + dependency_nodes.flat_map do |item|
node_result = valid_dependencies_for_target_from_node(target, cached_dependencys, item)
node_result = valid_dependencies_for_target_from_node(target, cached_dependencys, node)
cached_dependencys[node.name] = node_result cached_dependencys[item.name] = node_result
node_result node_result
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment