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

install: refactoring blacklist check

Browse Source 
Closes Homebrew/homebrew#37590.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-03-11 16:36:36 +08:00
parent c19c355226
commit b136a0acdf
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cmd/install.rb
View File

@ -14,11 +14,6 @@ module Homebrew
end end
ARGV.named.each do |name| ARGV.named.each do |name|
# if a formula has been tapped ignore the blacklisting
unless Formula.path(name).file?
msg = blacklisted? name
raise "No available formula for #{name}\n#{msg}" if msg
end
if !File.exist?(name) && (name =~ HOMEBREW_TAP_FORMULA_REGEX \ if !File.exist?(name) && (name =~ HOMEBREW_TAP_FORMULA_REGEX \
|| name =~ HOMEBREW_CASK_TAP_FORMULA_REGEX) || name =~ HOMEBREW_CASK_TAP_FORMULA_REGEX)
install_tap $1, $2 install_tap $1, $2
@ -87,14 +82,18 @@ module Homebrew
formulae.each { |f| install_formula(f) } formulae.each { |f| install_formula(f) }
rescue FormulaUnavailableError => e rescue FormulaUnavailableError => e
if (blacklist = blacklisted?(e.name))
ofail "#{e.message}\n#{blacklist}"
else
ofail e.message ofail e.message
query = query_regexp(e.name) query = query_regexp(e.name)
puts 'Searching formulae...' puts "Searching formulae..."
puts_columns(search_formulae(query)) puts_columns(search_formulae(query))
puts 'Searching taps...' puts "Searching taps..."
puts_columns(search_taps(query)) puts_columns(search_taps(query))
end end
end end
end
def check_ppc def check_ppc
case Hardware::CPU.type when :ppc, :dunno case Hardware::CPU.type when :ppc, :dunno