From 46633af76ad313f33fd6cad1ff2384fa46c3fe39 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Tue, 23 Jan 2018 11:26:00 +0000
Subject: requirement: call satisfied? from modify_build_environment.

---
 Library/Homebrew/requirement.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
index e2b1afbb9..66e1422cd 100644
--- a/Library/Homebrew/requirement.rb
+++ b/Library/Homebrew/requirement.rb
@@ -51,9 +51,10 @@ class Requirement
   # Overriding #satisfied? is deprecated.
   # Pass a block or boolean to the satisfy DSL method instead.
   def satisfied?
-    result = self.class.satisfy.yielder { |p| instance_eval(&p) }
-    @satisfied_result = result
-    return false unless result
+    satisfy = self.class.satisfy
+    return true unless satisfy
+    @satisfied_result = satisfy.yielder { |p| instance_eval(&p) }
+    return false unless @satisfied_result
     true
   end
 
@@ -74,9 +75,8 @@ class Requirement
 
   # Overriding #modify_build_environment is deprecated.
   # Pass a block to the env DSL method instead.
-  # Note: #satisfied? should be called before invoking this method
-  # as the env modifications may depend on its side effects.
   def modify_build_environment
+    satisfied?
     instance_eval(&env_proc) if env_proc
 
     # XXX If the satisfy block returns a Pathname, then make sure that it
-- 
cgit v1.2.3