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

Ignore `FormulaUnreadableError` in `Formula.each`.
Homebrew · Sep 3, 2020 · 2dbaaf3 · 2dbaaf3
2 parents 197e1f3 + 8fb769e
commit 2dbaaf3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
@@ -1460,14 +1460,12 @@ def self.full_names
   # @private
   def self.each
     files.each do |file|
-      yield begin
-        Formulary.factory(file)
-      rescue FormulaUnavailableError => e
-        # Don't let one broken formula break commands. But do complain.
-        onoe "Failed to import: #{file}"
-        puts e
-        next
-      end
+      yield Formulary.factory(file)
+    rescue FormulaUnavailableError, FormulaUnreadableError => e
+      # Don't let one broken formula break commands. But do complain.
+      onoe "Failed to import: #{file}"
+      $stderr.puts e
+      next
     end
   end
 

diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
@@ -42,7 +42,7 @@ def self.load_formula(name, path, contents, namespace, flags:)
       # access them from within the formula's class scope.
       mod.const_set(:BUILD_FLAGS, flags)
       mod.module_eval(contents, path)
-    rescue NameError, ArgumentError, ScriptError => e
+    rescue NameError, ArgumentError, ScriptError, MethodDeprecatedError => e
       $stderr.puts e.backtrace if Homebrew::EnvConfig.developer?
       raise FormulaUnreadableError.new(name, e)
     end