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

Merge pull request #8531 from SeekingMeaning/formulary/bottle-formula-path

Browse Source 
formulary: use formula path when loading from bottle
This commit is contained in:
Mike McQuaid 2020-08-31 08:23:08 +01:00 committed by GitHub
commit d6d0e3208c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/formulary.rb
View File

@ -175,7 +175,7 @@ module Formulary
def get_formula(spec, force_bottle: false, flags: [], **) def get_formula(spec, force_bottle: false, flags: [], **)
contents = Utils::Bottles.formula_contents @bottle_filename, name: name contents = Utils::Bottles.formula_contents @bottle_filename, name: name
formula = begin formula = begin
Formulary.from_contents(name, @bottle_filename, contents, spec, force_bottle: force_bottle, flags: flags) Formulary.from_contents(name, path, contents, spec, force_bottle: force_bottle, flags: flags)
rescue FormulaUnreadableError => e rescue FormulaUnreadableError => e
opoo <<~EOS opoo <<~EOS
Unreadable formula in #{@bottle_filename}: Unreadable formula in #{@bottle_filename}: