From 0152b3483994b6a9c6f8b1f752b93408a0f5adac Mon Sep 17 00:00:00 2001 From: Max Howell Date: Mon, 6 Aug 2012 14:18:03 -0400 Subject: [PATCH] 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. --- Library/Homebrew/cmd/install.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 8a6c78bb4a..2d2d2903a5 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?