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

allow install bottle unneeded formulae for non Xcode/CLT install

Browse Source
This commit is contained in:
Xu Cheng 2015-10-19 18:11:25 +08:00
parent c4067cf8bb
commit f41925b360
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formula_installer.rb
View File

@ -164,7 +164,7 @@ class FormulaInstaller
check_conflicts check_conflicts
if !pour_bottle? && !MacOS.has_apple_developer_tools? if !pour_bottle? && !formula.bottle_unneeded? && !MacOS.has_apple_developer_tools?
raise BuildToolsError.new([formula]) raise BuildToolsError.new([formula])
end end
@ -256,7 +256,10 @@ class FormulaInstaller
# abnormally with a BuildToolsError if one or more don't. # abnormally with a BuildToolsError if one or more don't.
# Only invoked when the user has no developer tools. # Only invoked when the user has no developer tools.
def check_dependencies_bottled(deps) def check_dependencies_bottled(deps)
unbottled = deps.reject { |dep, _| dep.to_formula.pour_bottle? } unbottled = deps.reject do |dep, _|
dep_f = dep.to_formula
dep_f.pour_bottle? || dep_f.bottle_unneeded?
end
raise BuildToolsError.new(unbottled) unless unbottled.empty? raise BuildToolsError.new(unbottled) unless unbottled.empty?
end end