admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

HOMEBREW_CURL_ARGS so that tests can be more silent

Browse Source
This commit is contained in:
Max Howell 2011-08-23 23:20:13 +01:00
parent 9713bb76b0
commit 42cc28597c
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/global.rb
View File

@ -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_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_LLVM = 2326
RECOMMENDED_GCC_40 = (MACOS_VERSION >= 10.6) ? 5494 : 5493 RECOMMENDED_GCC_40 = (MACOS_VERSION >= 10.6) ? 5494 : 5493

2
Library/Homebrew/test/testing_env.rb
View File

@ -15,9 +15,11 @@ require 'exceptions'
HOMEBREW_PREFIX=Pathname.new '/private/tmp/testbrew/prefix' HOMEBREW_PREFIX=Pathname.new '/private/tmp/testbrew/prefix'
HOMEBREW_REPOSITORY=HOMEBREW_PREFIX HOMEBREW_REPOSITORY=HOMEBREW_PREFIX
HOMEBREW_CACHE=HOMEBREW_PREFIX.parent+"cache" HOMEBREW_CACHE=HOMEBREW_PREFIX.parent+"cache"
HOMEBREW_CACHE_FORMULA=HOMEBREW_PREFIX.parent+"formula_cache"
HOMEBREW_CELLAR=HOMEBREW_PREFIX.parent+"cellar" HOMEBREW_CELLAR=HOMEBREW_PREFIX.parent+"cellar"
HOMEBREW_USER_AGENT="Homebrew" HOMEBREW_USER_AGENT="Homebrew"
HOMEBREW_WWW='http://example.com' HOMEBREW_WWW='http://example.com'
HOMEBREW_CURL_ARGS = '-fsLA'
MACOS_VERSION=10.6 MACOS_VERSION=10.6
(HOMEBREW_PREFIX+'Library/Formula').mkpath (HOMEBREW_PREFIX+'Library/Formula').mkpath

2
Library/Homebrew/utils.rb
View File

@ -104,7 +104,7 @@ def quiet_system cmd, *args
end end
def curl *args 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 end
def puts_columns items, star_items=[] def puts_columns items, star_items=[]