From 5b06a27e993d38ff278fd0cfe3c5ce1e6750f337 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 25 Jul 2011 17:26:31 -0500 Subject: 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 --- Library/Homebrew/cmd/doctor.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Library') 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 -- cgit v1.2.3