Refactor MacOS check_development_tools usage.

Better use the abstraction layer so e.g. Linux could have similarly
fatal checks for these things.

1 files changed, 8 insertions, 7 deletions

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