Commit 33c88fc7 authored by Samuel E. Giddins's avatar Samuel E. Giddins

[Resolver] Refactor the construction of requirement_satisfied

parent 3220bf21
......@@ -178,12 +178,13 @@ module Pod
existing_vertices = activated.vertices.values.select do |v|
Specification.root_name(v.name) == requirement.root_name
end
requirement_satisfied = if existing = existing_vertices.map(&:payload).compact.first
existing.version == spec.version &&
requirement.requirement.satisfied_by?(spec.version)
else
requirement.requirement.satisfied_by? spec.version
end
existing = existing_vertices.map(&:payload).compact.first
requirement_satisfied =
if existing
existing.version == spec.version && requirement.requirement.satisfied_by?(spec.version)
else
requirement.requirement.satisfied_by? spec.version
end
requirement_satisfied && !(spec.version.prerelease? && existing_vertices.flat_map(&:requirements).none?(&:prerelease?))
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