Merge pull request #16129 from apainintheneck/rescue-formula-spec-err…

…ors-in-parser cli/parser: rescue formula specification errors
Homebrew · Oct 22, 2023 · 35746e0 · 35746e0
2 parents 46a8310 + 779d900
commit 35746e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb
@@ -140,7 +140,8 @@ def load_formula_or_cask(name, only: nil, method: nil, warn: nil)
  warn_if_cask_conflicts(name, "formula") if only != :formula
  return formula
  rescue FormulaUnreadableError, FormulaClassUnavailableError,
- TapFormulaUnreadableError, TapFormulaClassUnavailableError => e
+ TapFormulaUnreadableError, TapFormulaClassUnavailableError,
+ FormulaSpecificationError => e
  # Need to rescue before `FormulaUnavailableError` (superclass of this)
  # The formula was found, but there's a problem with its implementation
  unreadable_error ||= e

diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb
@@ -653,7 +653,7 @@ def formulae(argv)
 
  begin
  Formulary.factory(arg, spec, flags: argv.select { |a| a.start_with?("--") })
- rescue FormulaUnavailableError
+ rescue FormulaUnavailableError, FormulaSpecificationError
  nil
  end
  end.compact.uniq(&:name)