Merge pull request #4328 from woodruffw/install-check-dev-tools
[WIP] formula_installer: Don't check devtools if pouring
This commit is contained in:
commit
78757bf56e
@ -13,6 +13,7 @@ require "emoji"
|
|||||||
require "development_tools"
|
require "development_tools"
|
||||||
require "cache_store"
|
require "cache_store"
|
||||||
require "linkage_checker"
|
require "linkage_checker"
|
||||||
|
require "install"
|
||||||
|
|
||||||
class FormulaInstaller
|
class FormulaInstaller
|
||||||
include FormulaCellarChecks
|
include FormulaCellarChecks
|
||||||
@ -219,6 +220,10 @@ class FormulaInstaller
|
|||||||
end
|
end
|
||||||
|
|
||||||
def install
|
def install
|
||||||
|
if !formula.bottle_unneeded? && !pour_bottle? && DevelopmentTools.installed?
|
||||||
|
Homebrew::Install.check_development_tools
|
||||||
|
end
|
||||||
|
|
||||||
# not in initialize so upgrade can unlink the active keg before calling this
|
# not in initialize so upgrade can unlink the active keg before calling this
|
||||||
# function but after instantiating this class so that it can avoid having to
|
# function but after instantiating this class so that it can avoid having to
|
||||||
# relink the active keg if possible (because it is slow).
|
# relink the active keg if possible (because it is slow).
|
||||||
|
|||||||
@ -47,7 +47,6 @@ module Homebrew
|
|||||||
def perform_preinstall_checks
|
def perform_preinstall_checks
|
||||||
check_ppc
|
check_ppc
|
||||||
check_writable_install_location
|
check_writable_install_location
|
||||||
check_development_tools if DevelopmentTools.installed?
|
|
||||||
check_cellar
|
check_cellar
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user