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

xcode: check Xcode installed before using version.

Browse Source 
This avoids infinite recursion described in:
https://github.com/Homebrew/brew/pull/3422#issuecomment-342001451
This commit is contained in:
Mike McQuaid 2017-11-05 20:22:01 +00:00
parent ffe523a7a8
commit e300713f25
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/os/mac/xcode.rb
View File

@ -272,7 +272,9 @@ module OS
def detect_version def detect_version
# CLT isn't a distinct entity pre-4.3, and pkgutil doesn't exist # CLT isn't a distinct entity pre-4.3, and pkgutil doesn't exist
# at all on Tiger, so just count it as installed if Xcode is installed # at all on Tiger, so just count it as installed if Xcode is installed
return MacOS::Xcode.version if MacOS::Xcode.version < "3.0" if MacOS::Xcode.installed? && MacOS::Xcode.version < "3.0"
return MacOS::Xcode.version
end
version = nil version = nil
[MAVERICKS_PKG_ID, MAVERICKS_NEW_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].each do |id| [MAVERICKS_PKG_ID, MAVERICKS_NEW_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].each do |id|