diff options
| author | Mike McQuaid | 2014-08-10 16:41:30 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-08-10 16:41:30 +0100 |
| commit | 064aff2591440fba625b23d7a1f421c8c6e1fb37 (patch) | |
| tree | 8dc4ea92abec7852d29bdbeca6cdb070000a33eb /Library/Homebrew/formula_installer.rb | |
| parent | 03cf38c4515485f53d048995e48d82b2518f8b96 (diff) | |
| download | brew-064aff2591440fba625b23d7a1f421c8c6e1fb37.tar.bz2 | |
Revert "formula_installer: fix reqs default formulae."
This reverts commit 435092ae0521e79d8ea21c8d4708031e3b4b17a3.
Diffstat (limited to 'Library/Homebrew/formula_installer.rb')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 5cd7be576..45c70e6ce 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -262,14 +262,12 @@ class FormulaInstaller Requirement.prune elsif req.build? && dependent != f && install_bottle_for_dep?(dependent, build) Requirement.prune - elsif req.satisfied? && !(pour_bottle? || build_bottle?) - Requirement.prune elsif install_requirement_default_formula?(req) dep = req.to_dependency deps.unshift(dep) formulae.unshift(dep.to_formula) Requirement.prune - elsif deps.include?(req.to_dependency) + elsif req.satisfied? Requirement.prune else unsatisfied_reqs[dependent] << req |