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

Revert "disable :any bottles due to Homebrew/homebrew#24780"

Browse Source 
This reverts commit 31bab6e52b7ed8c63421b9c647d0592af2ee2635.
This commit is contained in:
Jack Nagel 2013-11-30 16:35:58 -06:00
parent a785a47452
commit 5a9356a204
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/bottles.rb
View File

@ -17,10 +17,7 @@ def install_bottle? f, options={:warn=>false}
return false unless f.pour_bottle? return false unless f.pour_bottle?
return false unless f.default_build? return false unless f.default_build?
return false unless bottle_current?(f) return false unless bottle_current?(f)
# Disable "any", it is broken when relocating via :any if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
# if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
# See: https://github.com/mxcl/homebrew/issues/24780
if f.bottle.cellar != HOMEBREW_CELLAR.to_s
if options[:warn] if options[:warn]
opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}" opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}"
end end