diff options
| author | Jack Nagel | 2013-11-30 16:35:58 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-11-30 16:35:58 -0600 |
| commit | 8bc77f5342be14437f947f47c465388bfc37d565 (patch) | |
| tree | e68b4b71741b3ace9fe222cd9feb885dca478632 /Library | |
| parent | 6df8f65d45202ff83746dcb7c4e7a9e73f434603 (diff) | |
| download | homebrew-8bc77f5342be14437f947f47c465388bfc37d565.tar.bz2 | |
Revert "disable :any bottles due to #24780"
This reverts commit 31bab6e52b7ed8c63421b9c647d0592af2ee2635.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/bottles.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb index e29f41463..c2c9db373 100644 --- a/Library/Homebrew/bottles.rb +++ b/Library/Homebrew/bottles.rb @@ -17,10 +17,7 @@ def install_bottle? f, options={:warn=>false} return false unless f.pour_bottle? return false unless f.default_build? 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 - # See: https://github.com/mxcl/homebrew/issues/24780 - if f.bottle.cellar != HOMEBREW_CELLAR.to_s + if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s if options[:warn] opoo "Building source; cellar of #{f}'s bottle is #{f.bottle.cellar}" end |