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

Merge pull request #15778 from Bo98/dep-source-fix

Browse Source 
formula_installer: use cached fetched formula instance when available
This commit is contained in:
Mike McQuaid 2023-08-15 11:37:26 +01:00 committed by GitHub
commit d7268aeb18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/formula_installer.rb
View File

@ -96,6 +96,9 @@ class FormulaInstaller
@requirement_messages = [] @requirement_messages = []
@poured_bottle = false @poured_bottle = false
@start_time = nil @start_time = nil
# Take the original formula instance, which might have been swapped from an API instance to a source instance
@formula = previously_fetched_formula if previously_fetched_formula
end end
def self.attempted def self.attempted
@ -1182,9 +1185,17 @@ on_request: installed_on_request?, options: options)
deps.each { |dep, _options| fetch_dependency(dep) } deps.each { |dep, _options| fetch_dependency(dep) }
end end
sig { returns(T.nilable(Formula)) }
def previously_fetched_formula
# We intentionally don't compare classes here.
self.class.fetched.find do |fetched_formula|
fetched_formula.full_name == formula.full_name && fetched_formula.active_spec_sym == formula.active_spec_sym
end
end
sig { void } sig { void }
def fetch def fetch
return if self.class.fetched.include?(formula) return if previously_fetched_formula
fetch_dependencies fetch_dependencies