aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-03-21 14:49:31 +0100
committerGitHub2017-03-21 14:49:31 +0100
commit7095b9b3c7ca8584a4e7528aa62f0ae87e3afdc0 (patch)
treeb6f0310c35ab79a8bbf0b26e19a9329040caf93d
parent7d068d468d7d6773f0f8d22dbb98c5766e3c19fe (diff)
parent60f96df44dc9d3145d605cddee1d27b1980ae14a (diff)
downloadbrew-7095b9b3c7ca8584a4e7528aa62f0ae87e3afdc0.tar.bz2
Merge pull request #2348 from MikeMcQuaid/up-to-date-requirement-formulae
formula_installer: need up to date requirement formulae.
-rw-r--r--Library/Homebrew/formula_installer.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 1f91ad5c4..fa46a30f4 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -410,10 +410,13 @@ class FormulaInstaller
end
def install_requirement_formula?(req, dependent, build)
- return false unless req.to_dependency
+ req_dependency = req.to_dependency
+ return false unless req_dependency
return true unless req.satisfied?
return false if req.run?
- install_bottle_for?(dependent, build) || build_bottle?
+ return true if build_bottle?
+ return true unless req_dependency.installed?
+ install_bottle_for?(dependent, build)
end
def expand_requirements