Skip to content
Snippets Groups Projects
Unverified Commit 2dbaaf35 authored by Markus Reiter's avatar Markus Reiter Committed by GitHub
Browse files

Merge pull request #8592 from reitermarkus/desc-cache-ignore-exceptions

Ignore `FormulaUnreadableError` in `Formula.each`.
parents 197e1f30 8fb769e6
No related branches found
No related tags found
No related merge requests found
...@@ -1460,14 +1460,12 @@ class Formula ...@@ -1460,14 +1460,12 @@ class Formula
# @private # @private
def self.each def self.each
files.each do |file| files.each do |file|
yield begin yield Formulary.factory(file)
Formulary.factory(file) rescue FormulaUnavailableError, FormulaUnreadableError => e
rescue FormulaUnavailableError => e # Don't let one broken formula break commands. But do complain.
# Don't let one broken formula break commands. But do complain. onoe "Failed to import: #{file}"
onoe "Failed to import: #{file}" $stderr.puts e
puts e next
next
end
end end
end end
......
...@@ -42,7 +42,7 @@ module Formulary ...@@ -42,7 +42,7 @@ module Formulary
# access them from within the formula's class scope. # access them from within the formula's class scope.
mod.const_set(:BUILD_FLAGS, flags) mod.const_set(:BUILD_FLAGS, flags)
mod.module_eval(contents, path) mod.module_eval(contents, path)
rescue NameError, ArgumentError, ScriptError => e rescue NameError, ArgumentError, ScriptError, MethodDeprecatedError => e
$stderr.puts e.backtrace if Homebrew::EnvConfig.developer? $stderr.puts e.backtrace if Homebrew::EnvConfig.developer?
raise FormulaUnreadableError.new(name, e) raise FormulaUnreadableError.new(name, e)
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment