aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2011-07-25 17:26:31 -0500
committerAdam Vandenberg2011-07-25 16:25:44 -0700
commit5b06a27e993d38ff278fd0cfe3c5ce1e6750f337 (patch)
treed1253d1bfd580e501404713388528c08586a9bad /Library
parent113eaf26e4a5477278ad72a4f80909a4a7c4106d (diff)
downloadbrew-5b06a27e993d38ff278fd0cfe3c5ce1e6750f337.tar.bz2
doctor: be more forgiving about GREP_OPTIONS
Currently, `brew doctor` complains about GREP_OPTIONS being set, regardless of its value. The cmake formula, for which this check was introduced, is more specific about what actually makes it fail. GREP_OPTIONS='--color=auto' will not cause the build to fail, so don't warn about this. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/doctor.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 5cd575b27..7e457a790 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -684,10 +684,10 @@ end
def check_for_GREP_OPTIONS
target_var = ENV['GREP_OPTIONS'].to_s
- unless target_var.empty?
+ unless target_var.empty? or target_var == '--color=auto'
puts <<-EOS.undent
$GREP_OPTIONS was set to \"#{target_var}\".
- Having $GREP_OPTIONS set can cause CMake builds to fail.
+ Having $GREP_OPTIONS set this way can cause CMake builds to fail.
EOS
end