Remove requested? dependency magic

This commit is contained in:
Jack Nagel 2014-02-27 14:22:42 -06:00
parent 750b843edc
commit e9b687070a
2 changed files with 3 additions and 10 deletions

View File

@ -36,10 +36,6 @@ class Dependency
to_formula.installed?
end
def requested?
ARGV.formulae.include?(to_formula) rescue false
end
def satisfied?
installed? && missing_options.empty?
end

View File

@ -263,13 +263,10 @@ class FormulaInstaller
oh1 "Installing dependencies for #{f}: #{Tty.green}#{deps*", "}#{Tty.reset}"
end
deps.each do |dep|
if dep.requested?
install_dependency(dep)
else
ARGV.filter_for_dependencies { install_dependency(dep) }
end
ARGV.filter_for_dependencies do
deps.each { |dep| install_dependency(dep) }
end
@show_header = true unless deps.empty?
end