Replace usages of recursive_deps with recursive_dependencies
This commit is contained in:
parent
82051a56ec
commit
109145bf21
@ -65,12 +65,12 @@ end
|
||||
def pre_superenv_hacks f
|
||||
# Allow a formula to opt-in to the std environment.
|
||||
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'
|
||||
end
|
||||
|
||||
def install f
|
||||
deps = f.recursive_deps
|
||||
deps = f.recursive_dependencies.map(&:to_formula)
|
||||
keg_only_deps = deps.select(&:keg_only?)
|
||||
|
||||
pre_superenv_hacks(f)
|
||||
@ -83,7 +83,7 @@ def install f
|
||||
|
||||
if superenv?
|
||||
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.setup_build_environment
|
||||
post_superenv_hacks(f)
|
||||
|
||||
@ -23,7 +23,7 @@ module Homebrew extend self
|
||||
else
|
||||
raise FormulaUnspecifiedError if ARGV.named.empty?
|
||||
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)
|
||||
all_deps.sort! unless ARGV.include? "-n"
|
||||
puts all_deps
|
||||
|
||||
@ -10,7 +10,7 @@ module Homebrew extend self
|
||||
bucket = []
|
||||
ARGV.formulae.each do |f|
|
||||
bucket << f
|
||||
bucket << f.recursive_deps
|
||||
bucket << f.recursive_dependencies.map(&:to_formula)
|
||||
end
|
||||
|
||||
bucket = bucket.flatten.uniq
|
||||
|
||||
@ -466,7 +466,7 @@ class Formula
|
||||
# The full set of Requirements for this formula's dependency tree.
|
||||
def recursive_requirements
|
||||
reqs = ComparableSet.new
|
||||
recursive_deps.each { |dep| reqs.merge dep.requirements }
|
||||
recursive_dependencies.each { |d| reqs.merge d.to_formula.requirements }
|
||||
reqs.merge requirements
|
||||
end
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ class FormulaInstaller
|
||||
end
|
||||
|
||||
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?
|
||||
end
|
||||
raise CannotInstallFormulaError,
|
||||
@ -491,7 +491,9 @@ class FormulaInstaller
|
||||
|
||||
def lock
|
||||
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.each(&:lock)
|
||||
@hold_locks = true
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user