diff options
| author | Max Howell | 2011-08-23 23:20:13 +0100 |
|---|---|---|
| committer | Max Howell | 2011-08-24 22:30:43 +0100 |
| commit | 42cc28597cb8b6260fccd7ff9849a1f04ae17d78 (patch) | |
| tree | f4e58b42baaee7974fd73e60229786f6e0629d90 | |
| parent | 9713bb76b004f5e179238cb2821e2a3ec0fea673 (diff) | |
| download | brew-42cc28597cb8b6260fccd7ff9849a1f04ae17d78.tar.bz2 | |
HOMEBREW_CURL_ARGS so that tests can be more silent
| -rw-r--r-- | Library/Homebrew/global.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/test/testing_env.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/utils.rb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 7e6f38949..e7a7a181f 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -45,6 +45,7 @@ MACOS_VERSION = /(10\.\d+)(\.\d+)?/.match(MACOS_FULL_VERSION).captures.first.to_ HOMEBREW_USER_AGENT = "Homebrew #{HOMEBREW_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}; Mac OS X #{MACOS_FULL_VERSION})" +HOMEBREW_CURL_ARGS = '-f#LA' RECOMMENDED_LLVM = 2326 RECOMMENDED_GCC_40 = (MACOS_VERSION >= 10.6) ? 5494 : 5493 diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb index 0933185bb..c0556651c 100644 --- a/Library/Homebrew/test/testing_env.rb +++ b/Library/Homebrew/test/testing_env.rb @@ -15,9 +15,11 @@ require 'exceptions' HOMEBREW_PREFIX=Pathname.new '/private/tmp/testbrew/prefix' HOMEBREW_REPOSITORY=HOMEBREW_PREFIX HOMEBREW_CACHE=HOMEBREW_PREFIX.parent+"cache" +HOMEBREW_CACHE_FORMULA=HOMEBREW_PREFIX.parent+"formula_cache" HOMEBREW_CELLAR=HOMEBREW_PREFIX.parent+"cellar" HOMEBREW_USER_AGENT="Homebrew" HOMEBREW_WWW='http://example.com' +HOMEBREW_CURL_ARGS = '-fsLA' MACOS_VERSION=10.6 (HOMEBREW_PREFIX+'Library/Formula').mkpath diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index a26a6ab93..3160ffe14 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -104,7 +104,7 @@ def quiet_system cmd, *args end def curl *args - safe_system '/usr/bin/curl', '-f#LA', HOMEBREW_USER_AGENT, *args unless args.empty? + safe_system '/usr/bin/curl', HOMEBREW_CURL_ARGS, HOMEBREW_USER_AGENT, *args unless args.empty? end def puts_columns items, star_items=[] |