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

Merge pull request #17695 from reitermarkus/from-bottle-loader-downloadable

Browse Source
This commit is contained in:
Mike McQuaid 2024-07-13 13:13:36 -04:00 committed by GitHub
commit ab7e49c462
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Library/Homebrew/formulary.rb
View File

@ -592,36 +592,23 @@ module Formulary
def self.try_new(ref, from: T.unsafe(nil), warn: false) def self.try_new(ref, from: T.unsafe(nil), warn: false)
ref = ref.to_s ref = ref.to_s
new(ref) if HOMEBREW_BOTTLES_EXTNAME_REGEX.match?(ref) new(ref) if HOMEBREW_BOTTLES_EXTNAME_REGEX.match?(ref) && File.exist?(ref)
end end
def initialize(bottle_name) def initialize(bottle_name, warn: false)
case bottle_name @bottle_path = Pathname(bottle_name).realpath
when URL_START_REGEX name, full_name = Utils::Bottles.resolve_formula_names(@bottle_path)
# The name of the formula is found between the last slash and the last hyphen.
formula_name = File.basename(bottle_name)[/(.+)-/, 1]
resource = Resource.new(formula_name) { url bottle_name }
resource.specs[:bottle] = true
downloader = resource.downloader
cached = downloader.cached_location.exist?
downloader.fetch
ohai "Pouring the cached bottle" if cached
@bottle_filename = downloader.cached_location
else
@bottle_filename = Pathname(bottle_name).realpath
end
name, full_name = Utils::Bottles.resolve_formula_names @bottle_filename
super name, Formulary.path(full_name) super name, Formulary.path(full_name)
end end
def get_formula(spec, force_bottle: false, flags: [], ignore_errors: false, **) def get_formula(spec, force_bottle: false, flags: [], ignore_errors: false, **)
formula = begin formula = begin
contents = Utils::Bottles.formula_contents(@bottle_filename, name:) contents = Utils::Bottles.formula_contents(@bottle_path, name:)
Formulary.from_contents(name, path, contents, spec, force_bottle:, Formulary.from_contents(name, path, contents, spec, force_bottle:,
flags:, ignore_errors:) flags:, ignore_errors:)
rescue FormulaUnreadableError => e rescue FormulaUnreadableError => e
opoo <<~EOS opoo <<~EOS
Unreadable formula in #{@bottle_filename}: Unreadable formula in #{@bottle_path}:
#{e} #{e}
EOS EOS
super super
@ -632,7 +619,7 @@ module Formulary
EOS EOS
super super
end end
formula.local_bottle_path = @bottle_filename formula.local_bottle_path = @bottle_path
formula formula
end end
end end