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

Merge pull request #16129 from apainintheneck/rescue-formula-spec-errors-in-parser

Browse Source 
cli/parser: rescue formula specification errors
This commit is contained in:
Mike McQuaid 2023-10-22 10:34:28 +01:00 committed by GitHub
commit 35746e0a6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cli/named_args.rb
View File

@ -140,7 +140,8 @@ module Homebrew
warn_if_cask_conflicts(name, "formula") if only != :formula warn_if_cask_conflicts(name, "formula") if only != :formula
return formula return formula
rescue FormulaUnreadableError, FormulaClassUnavailableError, rescue FormulaUnreadableError, FormulaClassUnavailableError,
TapFormulaUnreadableError, TapFormulaClassUnavailableError => e TapFormulaUnreadableError, TapFormulaClassUnavailableError,
FormulaSpecificationError => e
# Need to rescue before `FormulaUnavailableError` (superclass of this) # Need to rescue before `FormulaUnavailableError` (superclass of this)
# The formula was found, but there's a problem with its implementation # The formula was found, but there's a problem with its implementation
unreadable_error ||= e unreadable_error ||= e

2
Library/Homebrew/cli/parser.rb
View File

@ -653,7 +653,7 @@ module Homebrew
begin begin
Formulary.factory(arg, spec, flags: argv.select { |a| a.start_with?("--") }) Formulary.factory(arg, spec, flags: argv.select { |a| a.start_with?("--") })
rescue FormulaUnavailableError rescue FormulaUnavailableError, FormulaSpecificationError
nil nil
end end
end.compact.uniq(&:name) end.compact.uniq(&:name)