Skip to content

C
cocoapods
Commit 33c88fc7 authored by Samuel E. Giddins's avatar Samuel E. Giddins
Browse files
Options

[Resolver] Refactor the construction of requirement_satisfied

parent 3220bf21
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
lib/cocoapods/resolver.rb
View file @ 33c88fc7
...@@ -178,12 +178,13 @@ module Pod ...@@ -178,12 +178,13 @@ module Pod
existing_vertices = activated.vertices.values.select do |v| existing_vertices = activated.vertices.values.select do |v|
Specification.root_name(v.name) == requirement.root_name Specification.root_name(v.name) == requirement.root_name
end end
requirement_satisfied = if existing = existing_vertices.map(&:payload).compact.first existing = existing_vertices.map(&:payload).compact.first
existing.version == spec.version && requirement_satisfied =
requirement.requirement.satisfied_by?(spec.version) if existing
else existing.version == spec.version && requirement.requirement.satisfied_by?(spec.version)
requirement.requirement.satisfied_by? spec.version else
end requirement.requirement.satisfied_by? spec.version
end
requirement_satisfied && !(spec.version.prerelease? && existing_vertices.flat_map(&:requirements).none?(&:prerelease?)) requirement_satisfied && !(spec.version.prerelease? && existing_vertices.flat_map(&:requirements).none?(&:prerelease?))
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