Remove requested? dependency magic
This commit is contained in:
parent
750b843edc
commit
e9b687070a
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user