From 208bc0516b8cd3a25aa33f4ef4976caf72dd366e Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 2 Feb 2015 00:39:04 -0500 Subject: [PATCH] AprRequirement should not short-circuit if apr is installed If apr is installed, we still want to grab it during dependency resolution in case we need to pass options to the generated dependency. In other words, it doesn't make sense for the satisfiable condition to include the default formula, as the default formula is the fallback for when the requirement is *not* satisfied. --- Library/Homebrew/requirements/apr_dependency.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/apr_dependency.rb b/Library/Homebrew/requirements/apr_dependency.rb index c93a2e11a1..8b63256a87 100644 --- a/Library/Homebrew/requirements/apr_dependency.rb +++ b/Library/Homebrew/requirements/apr_dependency.rb @@ -4,7 +4,7 @@ class AprDependency < Requirement fatal true default_formula "apr-util" - satisfy { MacOS::CLT.installed? || Formula["apr"].installed? } + satisfy { MacOS::CLT.installed? } env do unless MacOS::CLT.installed?