From 23306ab434afc185e22a0f357a27e8da687620af Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Tue, 12 Jul 2016 19:46:29 +0100
Subject: github: produce better curl error messages. (#441)

* global: add RUBY_TWO global variable.

* test-bot: use RUBY_TWO global variable.

* github: produce better curl error messages.

If we don't know why curl has failed then ensure that the error messages
that it produced are included as part of the user output.
---
 Library/Homebrew/dev-cmd/test-bot.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Library/Homebrew/dev-cmd')

diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index b09d2608a..40e99f7b6 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -647,11 +647,9 @@ module Homebrew
       @category = __method__
       return if @skip_homebrew
 
-      ruby_two = RUBY_VERSION.split(".").first.to_i >= 2
-
       if @tap.nil?
         tests_args = []
-        if ruby_two
+        if RUBY_TWO
           tests_args << "--official-cmd-taps"
           tests_args << "--coverage" if ENV["TRAVIS"]
         end
@@ -892,7 +890,7 @@ module Homebrew
 
     ENV["HOMEBREW_DEVELOPER"] = "1"
     ENV["HOMEBREW_SANDBOX"] = "1"
-    ENV["HOMEBREW_RUBY_MACHO"] = "1" if RUBY_VERSION.split(".").first.to_i >= 2
+    ENV["HOMEBREW_RUBY_MACHO"] = "1" if RUBY_TWO
     ENV["HOMEBREW_NO_EMOJI"] = "1"
     ENV["HOMEBREW_FAIL_LOG_LINES"] = "150"
     ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"] = "1"
-- 
cgit v1.2.3