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

Merge pull request #1648 from MikeMcQuaid/remove-dependency-installer

Browse Source 
formula_installer: remove dependency_installer.
This commit is contained in:
Mike McQuaid 2016-12-10 19:50:27 +00:00 committed by GitHub
commit a3bacf1238
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/formula_installer.rb
View File

@ -60,10 +60,6 @@ class FormulaInstaller
@pour_failed = false @pour_failed = false
end end
def skip_deps_check?
ignore_deps?
end
# When no build tools are available and build flags are passed through ARGV, # When no build tools are available and build flags are passed through ARGV,
# it's necessary to interrupt the user before any sort of installation # it's necessary to interrupt the user before any sort of installation
# can proceed. Only invoked when the user has no developer tools. # can proceed. Only invoked when the user has no developer tools.
@ -125,7 +121,7 @@ class FormulaInstaller
def prelude def prelude
Tab.clear_cache Tab.clear_cache
verify_deps_exist unless skip_deps_check? verify_deps_exist unless ignore_deps?
lock lock
check_install_sanity check_install_sanity
end end
@ -147,7 +143,7 @@ class FormulaInstaller
def check_install_sanity def check_install_sanity
raise FormulaInstallationAlreadyAttemptedError, formula if @@attempted.include?(formula) raise FormulaInstallationAlreadyAttemptedError, formula if @@attempted.include?(formula)
return if skip_deps_check? return if ignore_deps?
recursive_deps = formula.recursive_dependencies recursive_deps = formula.recursive_dependencies
unlinked_deps = recursive_deps.map(&:to_formula).select do |dep| unlinked_deps = recursive_deps.map(&:to_formula).select do |dep|
@ -197,7 +193,7 @@ class FormulaInstaller
raise BuildToolsError, [formula] raise BuildToolsError, [formula]
end end
unless skip_deps_check? unless ignore_deps?
deps = compute_dependencies deps = compute_dependencies
check_dependencies_bottled(deps) if pour_bottle? && !DevelopmentTools.installed? check_dependencies_bottled(deps) if pour_bottle? && !DevelopmentTools.installed?
install_dependencies(deps) install_dependencies(deps)
@ -250,7 +246,7 @@ class FormulaInstaller
onoe e.message onoe e.message
opoo "Bottle installation failed: building from source." opoo "Bottle installation failed: building from source."
raise BuildToolsError, [formula] unless DevelopmentTools.installed? raise BuildToolsError, [formula] unless DevelopmentTools.installed?
compute_and_install_dependencies unless skip_deps_check? compute_and_install_dependencies unless ignore_deps?
else else
@poured_bottle = true @poured_bottle = true
end end
@ -442,12 +438,6 @@ class FormulaInstaller
@show_header = true unless deps.empty? @show_header = true unless deps.empty?
end end
class DependencyInstaller < FormulaInstaller
def skip_deps_check?
true
end
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)
@ -463,7 +453,7 @@ class FormulaInstaller
installed_keg.rename(tmp_keg) installed_keg.rename(tmp_keg)
end end
fi = DependencyInstaller.new(df) fi = FormulaInstaller.new(df)
fi.options |= tab.used_options fi.options |= tab.used_options
fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options) fi.options |= Tab.remap_deprecated_options(df.deprecated_options, dep.options)
fi.options |= inherited_options fi.options |= inherited_options