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

formula_installer: add fetch_dependency method.

Browse Source 
This uses `FormulaInstaller#fetch` to recursively fetch dependencies
through the dependency tree and allows `install_dependency` to not
do any fetching.
This commit is contained in:
Mike McQuaid 2020-05-03 14:53:50 +01:00
parent 2264c08cee
commit 48918bb5e3
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/formula_installer.rb
View File

@ -561,6 +561,18 @@ class FormulaInstaller
@show_header = true unless deps.empty? @show_header = true unless deps.empty?
end end
def fetch_dependency(dep)
df = dep.to_formula
fi = FormulaInstaller.new(df)
fi.build_from_source = Homebrew.args.build_formula_from_source?(df)
fi.force_bottle = false
fi.verbose = verbose?
fi.quiet = quiet?
fi.debug = debug?
fi.fetch
end
def install_dependency(dep, inherited_options) def install_dependency(dep, inherited_options)
df = dep.to_formula df = dep.to_formula
tab = Tab.for_formula(df) tab = Tab.for_formula(df)
@ -600,7 +612,6 @@ class FormulaInstaller
fi.installed_as_dependency = true fi.installed_as_dependency = true
fi.installed_on_request = df.any_version_installed? && tab.installed_on_request fi.installed_on_request = df.any_version_installed? && tab.installed_on_request
fi.prelude fi.prelude
fi.fetch
oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}" oh1 "Installing #{formula.full_name} dependency: #{Formatter.identifier(dep.name)}"
fi.install fi.install
fi.finish fi.finish
@ -952,9 +963,7 @@ class FormulaInstaller
return if deps.empty? || ignore_deps? return if deps.empty? || ignore_deps?
deps.each do |dep, _| deps.each { |dep, _options| fetch_dependency(dep) }
dep.to_formula.resources.each(&:fetch)
end
end end
def fetch def fetch