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

install: only check fatal development tools checks.

Browse Source
This commit is contained in:
Mike McQuaid 2016-11-05 10:40:23 -04:00
parent 83af084079
commit 6c9ca906af
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Homebrew/cmd/install.rb
View File

@ -223,25 +223,12 @@ module Homebrew
def check_development_tools def check_development_tools
checks = Diagnostic::Checks.new checks = Diagnostic::Checks.new
all_development_tools_checks = checks.development_tools_checks + checks.fatal_development_tools_checks.each do |check|
checks.fatal_development_tools_checks
all_development_tools_checks.each do |check|
out = checks.send(check) out = checks.send(check)
next if out.nil? next if out.nil?
if checks.fatal_development_tools_checks.include?(check) ofail out
odie out
else
opoo out
end end
end exit 1 if Homebrew.failed?
end
def check_macports
return if MacOS.macports_or_fink.empty?
opoo "It appears you have MacPorts or Fink installed."
puts "Software installed with other package managers causes known problems for"
puts "Homebrew. If a formula fails to build, uninstall MacPorts/Fink and try again."
end end
def check_cellar def check_cellar
@ -283,8 +270,5 @@ module Homebrew
# another formula. In that case, don't generate an error, just move on. # another formula. In that case, don't generate an error, just move on.
rescue CannotInstallFormulaError => e rescue CannotInstallFormulaError => e
ofail e.message ofail e.message
rescue BuildError
check_macports
raise
end end
end end