admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

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

Browse Source 
Ignore `FormulaUnreadableError` in `Formula.each`.
This commit is contained in:
Markus Reiter 2020-09-03 20:21:02 +02:00 committed by GitHub
commit 2dbaaf35aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/formula.rb
View File

@ -1460,16 +1460,14 @@ 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}"
puts e $stderr.puts e
next next
end end
end end
end
# Clear cache of .racks # Clear cache of .racks
def self.clear_racks_cache def self.clear_racks_cache

2
Library/Homebrew/formulary.rb
View File

@ -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