aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorMike McQuaid2016-09-07 09:51:06 +0100
committerGitHub2016-09-07 09:51:06 +0100
commitd1ba4f44c099ab2a5db311e9237c1892ebf83c6c (patch)
tree0b3e134a1bb0477db0d94067e61944acb9232396 /Library/Homebrew/cmd
parent9c5af247e82beb4668671d61e3f82958052c73f4 (diff)
parentf1cc1265afa43afb9bffba17c9fc18776b62dd99 (diff)
downloadbrew-d1ba4f44c099ab2a5db311e9237c1892ebf83c6c.tar.bz2
Merge pull request #833 from DomT4/death_by_xcode
xcode: die unless Xcode/CLT up-to-date on prerelease macOS
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/install.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index edf8093bf..074f5fbc3 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -223,9 +223,16 @@ module Homebrew
def check_development_tools
checks = Diagnostic::Checks.new
- checks.all_development_tools_checks.each do |check|
+ all_development_tools_checks = checks.development_tools_checks +
+ checks.fatal_development_tools_checks
+ all_development_tools_checks.each do |check|
out = checks.send(check)
- opoo out unless out.nil?
+ next if out.nil?
+ if checks.fatal_development_tools_checks.include?(check)
+ odie out
+ else
+ opoo out
+ end
end
end