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

FormulaInstaller: add prevent_build_flags to eliminate code repetition

Browse Source 
remove unneeded definition

change variable in FormulaInstaller.check_build_flags from bf to build_flags
This commit is contained in:
William Woodruff 2015-07-23 00:34:57 -04:00 committed by Misty De Meo
parent 91e598cf3f
commit f58506ea6f
4 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,11 +40,7 @@ module Homebrew
# if the user's flags will prevent bottle only-installations when no # if the user's flags will prevent bottle only-installations when no
# developer tools are available, we need to stop them early on # developer tools are available, we need to stop them early on
if !MacOS.can_build? FormulaInstaller.prevent_build_flags unless MacOS.can_build?
bf = ARGV.collect_build_flags
raise BuildFlagsError.new(bf) if !bf.empty?
end
ARGV.formulae.each do |f| ARGV.formulae.each do |f|
# head-only without --HEAD is an error # head-only without --HEAD is an error

8
Library/Homebrew/cmd/reinstall.rb
View File

@ -2,13 +2,7 @@ require "formula_installer"
module Homebrew module Homebrew
def reinstall def reinstall
if !MacOS.can_build? FormulaInstaller.prevent_build_flags unless MacOS.can_build?
bf = ARGV.collect_build_flags
if !bf.empty?
raise BuildFlagsError.new(bf)
end
end
ARGV.resolved_formulae.each { |f| reinstall_formula(f) } ARGV.resolved_formulae.each { |f| reinstall_formula(f) }
end end

8
Library/Homebrew/cmd/upgrade.rb
View File

@ -3,13 +3,7 @@ require "cmd/outdated"
module Homebrew module Homebrew
def upgrade def upgrade
if !MacOS.can_build? FormulaInstaller.prevent_build_flags unless MacOS.can_build?
bf = ARGV.collect_build_flags
if !bf.empty?
raise BuildFlagsError.new(bf)
end
end
Homebrew.perform_preinstall_checks Homebrew.perform_preinstall_checks

9
Library/Homebrew/formula_installer.rb
View File

@ -56,6 +56,13 @@ class FormulaInstaller
@pour_failed = false @pour_failed = false
end end
# called by install/reinstall/upgrade when no build tools are available
def self.prevent_build_flags
build_flags = ARGV.collect_build_flags
raise BuildFlagsError.new(build_flags) unless build_flags.empty?
end
def pour_bottle?(install_bottle_options = { :warn=>false }) def pour_bottle?(install_bottle_options = { :warn=>false })
return true if Homebrew::Hooks::Bottles.formula_has_bottle?(formula) return true if Homebrew::Hooks::Bottles.formula_has_bottle?(formula)
@ -234,8 +241,6 @@ class FormulaInstaller
end end
def check_dependencies_bottled(deps) def check_dependencies_bottled(deps)
unbottled = []
unbottled = deps.select do |dep, _| unbottled = deps.select do |dep, _|
formula = dep.to_formula formula = dep.to_formula
!formula.pour_bottle? && !MacOS.can_build? !formula.pour_bottle? && !MacOS.can_build?