diff options
| author | Max Howell | 2012-09-24 08:40:19 -0400 |
|---|---|---|
| committer | Max Howell | 2012-09-24 08:49:58 -0400 |
| commit | 82c58bb615420390bd49e6bf476d3000890b889c (patch) | |
| tree | 06415c77bcd152458674d8cf04943b055c87edf4 /Library/Homebrew | |
| parent | bcf0d6f2450cdea84a32f9a844307804f542fc21 (diff) | |
| download | brew-82c58bb615420390bd49e6bf476d3000890b889c.tar.bz2 | |
Fix doctor hanging if xcode-select is bad
Also fix typo in the superenv DEVELOPER_DIR set detection code.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/superenv.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index f703dd1be..7952d106a 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -942,6 +942,7 @@ def check_os_version end def check_xcode_license_approved + return if MacOS::Xcode.bad_xcode_select_path? # If the user installs Xcode-only, they have to approve the # license or no "xc*" tool will work. <<-EOS.undent if `/usr/bin/xcrun clang 2>&1` =~ /license/ and not $?.success? diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index 7024affc6..2697e80b8 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -184,7 +184,7 @@ class << ENV # nothing is valid, it still fixes most usage to supply a valid path that # is not "/". if MacOS::Xcode.bad_xcode_select_path? - (Xcode.prefix || HOMEBREW_PREFIX).to_s + (MacOS::Xcode.prefix || HOMEBREW_PREFIX).to_s end end |