From 921aa015760a0b85345efd8fb921537499657872 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Tue, 30 Aug 2016 03:57:07 +0100 Subject: install: die if Xcode/CLT not up-to-date on prereleases --- Library/Homebrew/cmd/install.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Library/Homebrew/cmd') diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index edf8093bf..a1df8f459 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -227,6 +227,12 @@ module Homebrew out = checks.send(check) opoo out unless out.nil? end + if OS.mac? && MacOS.prerelease? + checks.strict_development_tools_checks.each do |strict_check| + out = checks.send(strict_check) + odie out unless out.nil? + end + end end def check_macports -- cgit v1.2.3 From f1cc1265afa43afb9bffba17c9fc18776b62dd99 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 7 Sep 2016 09:11:06 +0100 Subject: Refactor MacOS check_development_tools usage. Better use the abstraction layer so e.g. Linux could have similarly fatal checks for these things. --- Library/Homebrew/cmd/install.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'Library/Homebrew/cmd') diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index a1df8f459..074f5fbc3 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -223,14 +223,15 @@ 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? - end - if OS.mac? && MacOS.prerelease? - checks.strict_development_tools_checks.each do |strict_check| - out = checks.send(strict_check) - odie out unless out.nil? + next if out.nil? + if checks.fatal_development_tools_checks.include?(check) + odie out + else + opoo out end end end -- cgit v1.2.3