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

doctor: guard against nil Xcode.version (#197)

Browse Source 
MacOS::Xcode.version may be nil (when neither Xcode nor CLT are installed),
so guard against that where it may happen in `brew doctor`.
This commit is contained in:
Andrew Janke 2016-05-04 15:54:01 -04:00
parent 9a9a989b75
commit 6f80b4688b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/diagnostic.rb
View File

@ -416,7 +416,7 @@ module Homebrew
end end
def check_for_osx_gcc_installer def check_for_osx_gcc_installer
return unless MacOS.version < "10.7" || MacOS::Xcode.version > "4.1" return unless MacOS.version < "10.7" || ((MacOS::Xcode.version || "0") > "4.1")
return unless MacOS.clang_version == "2.1" return unless MacOS.clang_version == "2.1"
fix_advice = if MacOS.version >= :mavericks fix_advice = if MacOS.version >= :mavericks
@ -439,7 +439,7 @@ module Homebrew
# if the uninstaller script isn't there, it's a good guess neither are # if the uninstaller script isn't there, it's a good guess neither are
# any troublesome leftover Xcode files # any troublesome leftover Xcode files
uninstaller = Pathname.new("/Developer/Library/uninstall-developer-folder") uninstaller = Pathname.new("/Developer/Library/uninstall-developer-folder")
return unless MacOS::Xcode.version >= "4.3" && uninstaller.exist? return unless ((MacOS::Xcode.version || "0") >= "4.3") && uninstaller.exist?
<<-EOS.undent <<-EOS.undent
You have leftover files from an older version of Xcode. You have leftover files from an older version of Xcode.