diff options
| author | Jack Nagel | 2014-02-27 14:22:42 -0600 |
|---|---|---|
| committer | Jack Nagel | 2014-02-27 14:22:42 -0600 |
| commit | e9b687070a50c6b3e83ad68013ad002723d96158 (patch) | |
| tree | a7e9402bf0a20dda6fb048dd7635fa19a9a0d12b | |
| parent | 750b843edc2f2486f8a3bc519453843a32fbcf90 (diff) | |
| download | brew-e9b687070a50c6b3e83ad68013ad002723d96158.tar.bz2 | |
Remove requested? dependency magic
| -rw-r--r-- | Library/Homebrew/dependency.rb | 4 | ||||
| -rw-r--r-- | 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 9bbe68fb5..1a2b60a18 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 c74687a98..fb1713447 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 |
