Rename filter_deps to expand_dependencies

This commit is contained in:
Jack Nagel 2013-12-09 14:36:10 -06:00
parent be5f9545dd
commit 293bde278a

View File

@ -173,7 +173,7 @@ class FormulaInstaller
check_requirements check_requirements
unsatisfied_deps.concat(requirement_deps) unsatisfied_deps.concat(requirement_deps)
unsatisfied_deps.concat(filter_deps) unsatisfied_deps.concat(expand_dependencies)
install_dependencies(unsatisfied_deps) install_dependencies(unsatisfied_deps)
ensure ensure
@ -236,7 +236,7 @@ class FormulaInstaller
end end
# Combine requested_deps and necessary deps. # Combine requested_deps and necessary deps.
def filter_deps def expand_dependencies
deps = Set.new.merge(requested_deps).merge(necessary_deps) deps = Set.new.merge(requested_deps).merge(necessary_deps)
f.recursive_dependencies.select { |d| deps.include? d } f.recursive_dependencies.select { |d| deps.include? d }
end end