aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd/install.rb
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Homebrew/cmd/install.rb')
-rw-r--r--Library/Homebrew/cmd/install.rb22
1 files changed, 3 insertions, 19 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index dcf46e5fa..16639c4aa 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -223,25 +223,12 @@ module Homebrew
def check_development_tools
checks = Diagnostic::Checks.new
- all_development_tools_checks = checks.development_tools_checks +
- checks.fatal_development_tools_checks
- all_development_tools_checks.each do |check|
+ checks.fatal_development_tools_checks.each do |check|
out = checks.send(check)
next if out.nil?
- if checks.fatal_development_tools_checks.include?(check)
- odie out
- else
- opoo out
- end
+ ofail out
end
- 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."
+ exit 1 if Homebrew.failed?
end
def check_cellar
@@ -283,8 +270,5 @@ module Homebrew
# another formula. In that case, don't generate an error, just move on.
rescue CannotInstallFormulaError => e
ofail e.message
- rescue BuildError
- check_macports
- raise
end
end