diff options
| author | Max Howell | 2012-08-06 14:18:03 -0400 |
|---|---|---|
| committer | Max Howell | 2012-08-06 14:22:22 -0400 |
| commit | 0152b3483994b6a9c6f8b1f752b93408a0f5adac (patch) | |
| tree | 3435d2dde08c164f3f02ffb19f3947e4f3fa6703 /Library | |
| parent | 97acbe8f66648ca5939c92e61c90ab21ee4c8cb2 (diff) | |
| download | brew-0152b3483994b6a9c6f8b1f752b93408a0f5adac.tar.bz2 | |
Don't blacklist tapped-dupes
If a formula is in Formula due to tapping or otherwise, don't prohibit installation.
Really we should make the blacklist *really* stuff that should be blacklisted and then if it is available still require a --force. But currently with okay stuff like vim in there, and libxml2 being both blacklisted *and* in mxcl/master, we are screwing ourselves.
TL;DR we should do some work on this component.
Fixes Homebrew/homebrew#13234.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 8a6c78bb4..2d2d2903a 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -7,8 +7,11 @@ module Homebrew extend self raise FormulaUnspecifiedError if ARGV.named.empty? ARGV.named.each do |name| - msg = blacklisted? name - raise "No available formula for #{name}\n#{msg}" if msg + # if a formula has been tapped ignore the blacklisting + if not File.file? HOMEBREW_REPOSITORY/"Library/Formula/#{name}.rb" + msg = blacklisted? name + raise "No available formula for #{name}\n#{msg}" if msg + end end unless ARGV.force? if Process.uid.zero? and not File.stat(HOMEBREW_BREW_FILE).uid.zero? |