admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #3724 from ilovezfs/call-satisfied-at-least-once

Browse Source 
build: call satisified? before modifying env.
This commit is contained in:
Mike McQuaid 2018-01-23 19:50:20 +00:00 committed by GitHub
commit ea0af7d1af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/requirement.rb
View File

@ -48,16 +48,17 @@ class Requirement
s s
end end
# Overriding #satisfied? is deprecated. # Overriding #satisfied? is unsupported.
# Pass a block or boolean to the satisfy DSL method instead. # Pass a block or boolean to the satisfy DSL method instead.
def satisfied? def satisfied?
result = self.class.satisfy.yielder { |p| instance_eval(&p) } satisfy = self.class.satisfy
@satisfied_result = result return true unless satisfy
return false unless result @satisfied_result = satisfy.yielder { |p| instance_eval(&p) }
return false unless @satisfied_result
true true
end end
# Overriding #fatal? is deprecated. # Overriding #fatal? is unsupported.
# Pass a boolean to the fatal DSL method instead. # Pass a boolean to the fatal DSL method instead.
def fatal? def fatal?
self.class.fatal || false self.class.fatal || false
@ -72,11 +73,10 @@ class Requirement
parent parent
end end
# Overriding #modify_build_environment is deprecated. # Overriding #modify_build_environment is unsupported.
# Pass a block to the env DSL method instead. # 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 def modify_build_environment
satisfied?
instance_eval(&env_proc) if env_proc instance_eval(&env_proc) if env_proc
# XXX If the satisfy block returns a Pathname, then make sure that it # XXX If the satisfy block returns a Pathname, then make sure that it
@ -139,8 +139,8 @@ class Requirement
attr_reader :env_proc, :build attr_reader :env_proc, :build
attr_rw :fatal, :cask, :download attr_rw :fatal, :cask, :download
def default_formula(val = nil) def default_formula(_val = nil)
# odeprecated "Requirement.default_formula" odeprecated "Requirement.default_formula"
end end
def satisfy(options = nil, &block) def satisfy(options = nil, &block)