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

Remove OSX-GCC from brew-doctor

Browse Source 
Also fix undesired output if git isn't installed.

Refs Homebrew/homebrew#10244.
This commit is contained in:
Max Howell 2012-02-17 00:07:09 +00:00
parent 4504662033
commit b5268a877e
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/cmd/doctor.rb
View File

@ -733,7 +733,7 @@ end
def check_git_status def check_git_status
HOMEBREW_REPOSITORY.cd do HOMEBREW_REPOSITORY.cd do
cmd = `git status -s Library/Homebrew/`.chomp cmd = `git status -s Library/Homebrew/ 2> /dev/null`.chomp
if system "/usr/bin/which -s git" and File.directory? '.git' and not cmd.empty? if system "/usr/bin/which -s git" and File.directory? '.git' and not cmd.empty?
ohai "You have uncommitted modifications to Homebrew's core." ohai "You have uncommitted modifications to Homebrew's core."
puts "Unless you know what you are doing, you should run:" puts "Unless you know what you are doing, you should run:"
@ -794,22 +794,6 @@ def check_for_enthought_python
EOS EOS
end end
def check_for_osx_gcc_installer
# Use the existence of Carbon headers to make a guess as to whether
# the osx-gcc-installer was used in lieu of Xcode.
unless File.exist? "/System/Library/Frameworks/Carbon.framework/Headers/Carbon.h"
puts <<-EOS.undent
It appears that you are using the osx-gcc-installer.
This is unsupported, and software that require headers and other
resources that are normally provided by Xcode will fail to compile.
We recommend that you install Xcode.
EOS
end
end
module Homebrew extend self module Homebrew extend self
def doctor def doctor
old_stdout = $stdout old_stdout = $stdout
@ -854,7 +838,6 @@ module Homebrew extend self
check_for_leopard_ssl check_for_leopard_ssl
check_git_version check_git_version
check_for_enthought_python check_for_enthought_python
check_for_osx_gcc_installer
ensure ensure
$stdout = old_stdout $stdout = old_stdout
end end