From e9b687070a50c6b3e83ad68013ad002723d96158 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 27 Feb 2014 14:22:42 -0600 Subject: [PATCH] Remove requested? dependency magic --- Library/Homebrew/dependency.rb | 4 ---- Library/Homebrew/formula_installer.rb | 9 +++------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index 9bbe68fb58..1a2b60a18b 100644 --- a/Library/Homebrew/dependency.rb +++ b/Library/Homebrew/dependency.rb @@ -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 diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index c74687a988..fb17134473 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -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