utils/curl: assume Ruby 2.

2016-08-16 17:00:38 +01:00 · 2016-08-16 17:00:38 +01:00 · ed5e2ea300
commit ed5e2ea300
parent 495da233d7
1 changed files with 3 additions and 9 deletions
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@ -21,14 +21,8 @@ end

 def curl_output(*args)
  curl_args = curl_args(args)
-  curl_args -= ["--fail"]
-  if RUBY_TWO
-    curl_args -= ["--silent"]
+  curl_args -= ["--fail", "--silent"]
  Open3.popen3(*curl_args) do |_, stdout, stderr, wait_thread|
    [stdout.read, stderr.read, wait_thread.value]
  end
-  else
-    output = Utils.popen_read_text(*curl_args)
-    [output, nil, $?]
-  end
 end