Commit 83b374d7 authored by Samuel E. Giddins's avatar Samuel E. Giddins

[Resolver][LazySpecification] Use new raise_if_missing parameter to subspec_by_name

parent 33c88fc7
...@@ -7,7 +7,7 @@ GIT ...@@ -7,7 +7,7 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Core.git remote: https://github.com/CocoaPods/Core.git
revision: dad46458c14c2ddf717d9d0fd49c0c18e4e13617 revision: 86c02faa738990d2ab10bbe07339de681637f8b4
branch: resolver branch: resolver
specs: specs:
cocoapods-core (0.34.4) cocoapods-core (0.34.4)
......
...@@ -106,13 +106,7 @@ module Pod ...@@ -106,13 +106,7 @@ module Pod
specs = find_cached_set(dependency). specs = find_cached_set(dependency).
all_specifications. all_specifications.
select { |s| dependency.requirement.satisfied_by? s.version }. select { |s| dependency.requirement.satisfied_by? s.version }.
map do |s| map { |s| s.subspec_by_name(dependency.name, false) }
begin
s.subspec_by_name dependency.name
rescue
nil
end
end.compact
specs. specs.
reverse. reverse.
......
...@@ -14,11 +14,11 @@ module Pod ...@@ -14,11 +14,11 @@ module Pod
specification.send(method, *args, &block) specification.send(method, *args, &block)
end end
def subspec_by_name(name = nil) def subspec_by_name(name = nil, raise_if_missing = true)
if !name || name == self.name if !name || name == self.name
self self
else else
specification.subspec_by_name(name) specification.subspec_by_name(name, raise_if_missing)
end end
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