Don't mutate deps collection when expanding requirements
Fixes Homebrew/homebrew-science#213.
This commit is contained in:
parent
bcfafca56b
commit
69dcc2592c
@ -61,10 +61,8 @@ class Build
|
||||
|
||||
def initialize(f)
|
||||
@f = f
|
||||
# Expand requirements before dependencies, as requirements
|
||||
# may add dependencies if a default formula is activated.
|
||||
@reqs = expand_reqs
|
||||
@deps = expand_deps
|
||||
@reqs = expand_reqs
|
||||
end
|
||||
|
||||
def post_superenv_hacks
|
||||
@ -88,7 +86,7 @@ class Build
|
||||
elsif req.build? && dependent != f
|
||||
Requirement.prune
|
||||
elsif req.satisfied? && req.default_formula? && (dep = req.to_dependency).installed?
|
||||
dependent.deps << dep
|
||||
deps << dep
|
||||
Requirement.prune
|
||||
end
|
||||
end
|
||||
|
||||
@ -186,7 +186,7 @@ class FormulaInstaller
|
||||
elsif req.satisfied?
|
||||
Requirement.prune
|
||||
elsif req.default_formula?
|
||||
dependent.deps << req.to_dependency
|
||||
unsatisfied_deps << req.to_dependency
|
||||
Requirement.prune
|
||||
else
|
||||
puts "#{dependent}: #{req.message}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user