Commit 7a3ddfee authored by Samuel E. Giddins's avatar Samuel E. Giddins

[Installer] Raise an Informative when frameworks conflict

parent f2697f98
...@@ -337,7 +337,10 @@ module Pod ...@@ -337,7 +337,10 @@ module Pod
frameworks += pod_targets.select { |pt| pt.should_build? && pt.requires_frameworks? }.map(&:product_module_name) frameworks += pod_targets.select { |pt| pt.should_build? && pt.requires_frameworks? }.map(&:product_module_name)
duplicates = frameworks.group_by { |f| f }.select { |_, v| v.size > 1 }.keys duplicates = frameworks.group_by { |f| f }.select { |_, v| v.size > 1 }.keys
raise "The '#{aggregate_target.label}' target has frameworks with conflicting names: #{duplicates.to_sentence}." unless duplicates.empty? unless duplicates.empty?
raise Informative, "The '#{aggregate_target.label}' target has " \
"frameworks with conflicting names: #{duplicates.to_sentence}."
end
end end
end end
end end
......
...@@ -161,7 +161,7 @@ module Pod ...@@ -161,7 +161,7 @@ module Pod
config.integrate_targets = false config.integrate_targets = false
@installer = Installer.new(config.sandbox, podfile, lockfile) @installer = Installer.new(config.sandbox, podfile, lockfile)
should.raise { @installer.install! }.message.should.match /conflict.*monkey/ should.raise(Informative) { @installer.install! }.message.should.match /conflict.*monkey/
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