aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMisty De Meo2012-09-14 16:58:38 -0500
committerMisty De Meo2012-09-14 17:11:51 -0500
commite8c372a31542a42690e51780b34d2f64454bdf60 (patch)
tree1b1aa580aac7dee218893a9eb2a3611a14a88daa /Library
parent50efa98638db1484f21f10af3d4a05c568d3896c (diff)
downloadbrew-e8c372a31542a42690e51780b34d2f64454bdf60.tar.bz2
Skip standard compilers check for unknown Xcode
Rescuing false on the StandardCompilers map meant that the doctor check assumed that the compilers were incorrect, not merely unknown. Instead, skip the check and return nil for unknown Xcode; nil should be interpreted as "dunno", instead of "true" or "false", and the doctor check no longer prints on nil.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/doctor.rb3
-rw-r--r--Library/Homebrew/macos.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 6b9ce1d51..d101ab7f6 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -259,7 +259,8 @@ end
def check_standard_compilers
return if check_for_latest_xcode # only check if Xcode is up to date
- if !MacOS.compilers_standard? then <<-EOS.undent
+ compiler_status = MacOS.compilers_standard?
+ if not compiler_status and not compiler_status.nil? then <<-EOS.undent
Your compilers are different from the standard versions for your Xcode.
If you have Xcode 4.3 or newer, you should install the Command Line Tools for
Xcode from within Xcode's Download preferences.
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb
index 8fa9e8416..1565449ee 100644
--- a/Library/Homebrew/macos.rb
+++ b/Library/Homebrew/macos.rb
@@ -204,9 +204,10 @@ module MacOS extend self
Thanks!
EOS
+ return
end
- StandardCompilers[xcode].all? { |method, build| MacOS.send(method) == build } rescue false
+ StandardCompilers[xcode].all? { |method, build| MacOS.send(method) == build }
end
def app_with_bundle_id id