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

Replace usages of recursive_deps with recursive_dependencies

Browse Source
This commit is contained in:
Jack Nagel 2013-01-23 00:26:29 -06:00
parent 82051a56ec
commit 109145bf21
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/build.rb
View File

@ -65,12 +65,12 @@ end
def pre_superenv_hacks f def pre_superenv_hacks f
# Allow a formula to opt-in to the std environment. # Allow a formula to opt-in to the std environment.
ARGV.unshift '--env=std' if (f.env.std? or ARGV.unshift '--env=std' if (f.env.std? or
f.recursive_deps.detect{|d| d.name == 'scons' }) and f.recursive_dependencies.detect{|d| d.name == 'scons' }) and
not ARGV.include? '--env=super' not ARGV.include? '--env=super'
end end
def install f def install f
deps = f.recursive_deps deps = f.recursive_dependencies.map(&:to_formula)
keg_only_deps = deps.select(&:keg_only?) keg_only_deps = deps.select(&:keg_only?)
pre_superenv_hacks(f) pre_superenv_hacks(f)
@ -83,7 +83,7 @@ def install f
if superenv? if superenv?
ENV.deps = keg_only_deps.map(&:to_s) ENV.deps = keg_only_deps.map(&:to_s)
ENV.all_deps = f.recursive_deps.map(&:to_s) ENV.all_deps = f.recursive_dependencies.map(&:to_s)
ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency } ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency }
ENV.setup_build_environment ENV.setup_build_environment
post_superenv_hacks(f) post_superenv_hacks(f)

2
Library/Homebrew/cmd/deps.rb
View File

@ -23,7 +23,7 @@ module Homebrew extend self
else else
raise FormulaUnspecifiedError if ARGV.named.empty? raise FormulaUnspecifiedError if ARGV.named.empty?
all_deps = ARGV.formulae.map do |f| all_deps = ARGV.formulae.map do |f|
ARGV.one? ? f.deps : f.recursive_deps ARGV.one? ? f.deps : f.recursive_dependencies
end.intersection.map(&:name) end.intersection.map(&:name)
all_deps.sort! unless ARGV.include? "-n" all_deps.sort! unless ARGV.include? "-n"
puts all_deps puts all_deps

2
Library/Homebrew/cmd/fetch.rb
View File

@ -10,7 +10,7 @@ module Homebrew extend self
bucket = [] bucket = []
ARGV.formulae.each do |f| ARGV.formulae.each do |f|
bucket << f bucket << f
bucket << f.recursive_deps bucket << f.recursive_dependencies.map(&:to_formula)
end end
bucket = bucket.flatten.uniq bucket = bucket.flatten.uniq

2
Library/Homebrew/formula.rb
View File

@ -466,7 +466,7 @@ class Formula
# The full set of Requirements for this formula's dependency tree. # The full set of Requirements for this formula's dependency tree.
def recursive_requirements def recursive_requirements
reqs = ComparableSet.new reqs = ComparableSet.new
recursive_deps.each { |dep| reqs.merge dep.requirements } recursive_dependencies.each { |d| reqs.merge d.to_formula.requirements }
reqs.merge requirements reqs.merge requirements
end end

6
Library/Homebrew/formula_installer.rb
View File

@ -52,7 +52,7 @@ class FormulaInstaller
end end
unless ignore_deps unless ignore_deps
unlinked_deps = f.recursive_deps.select do |dep| unlinked_deps = f.recursive_dependencies.map(&:to_formula).select do |dep|
dep.installed? and not dep.keg_only? and not dep.linked_keg.directory? dep.installed? and not dep.keg_only? and not dep.linked_keg.directory?
end end
raise CannotInstallFormulaError, raise CannotInstallFormulaError,
@ -491,7 +491,9 @@ class FormulaInstaller
def lock def lock
if (@@locked ||= []).empty? if (@@locked ||= []).empty?
f.recursive_deps.each { |d| @@locked << d } unless ignore_deps f.recursive_dependencies.each do |dep|
@@locked << dep.to_formula
end unless ignore_deps
@@locked.unshift(f) @@locked.unshift(f)
@@locked.each(&:lock) @@locked.each(&:lock)
@hold_locks = true @hold_locks = true