aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dependency.rb
diff options
context:
space:
mode:
authorMartin Afanasjew2015-12-15 10:50:38 +0100
committerMartin Afanasjew2015-12-17 13:50:38 +0100
commitea4d137e871ace8200743f237c48189e3b930da1 (patch)
treeb8c49cd42093a5e12f4b31ba34400f42cdf1f645 /Library/Homebrew/dependency.rb
parent0f9abe57ea819c63015103ed67de2ecd49398439 (diff)
downloadbrew-ea4d137e871ace8200743f237c48189e3b930da1.tar.bz2
dependency: fix merging tags in 'merge_repeats'
While it may suffice to merge string and non-reserved tags by forming a union of all tags of dependencies of the same name, this approach fails to work for the reserved tags. These are now merged such that the most restrictive tag (meaning sometimes an empty tag) is preserved. The previous behavior caused essential dependencies to be omitted and builds to fail in response. E.g., multiple `:fortran` dependencies with tags `[]`, `[:recommended]`, and `[:optional]` would have been expanded and merged to `"gcc"` with tags `[:recommended, :optional]`, causing it to be no longer seen as a required dependency. Closes Homebrew/homebrew#47040. Signed-off-by: Martin Afanasjew <martin@afanasjew.de>
Diffstat (limited to 'Library/Homebrew/dependency.rb')
-rw-r--r--Library/Homebrew/dependency.rb30
1 files changed, 29 insertions, 1 deletions
diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb
index a3b9d7b51..0e03ae0ea 100644
--- a/Library/Homebrew/dependency.rb
+++ b/Library/Homebrew/dependency.rb
@@ -124,11 +124,39 @@ class Dependency
all.map(&:name).uniq.map do |name|
deps = grouped.fetch(name)
dep = deps.first
- tags = deps.flat_map(&:tags).uniq
+ tags = merge_tags(deps)
option_names = deps.flat_map(&:option_names).uniq
dep.class.new(name, tags, dep.env_proc, option_names)
end
end
+
+ private
+
+ def merge_tags(deps)
+ options = deps.flat_map(&:option_tags).uniq
+ merge_necessity(deps) + merge_temporality(deps) + options
+ end
+
+ def merge_necessity(deps)
+ # Cannot use `deps.any?(&:required?)` here due to its definition.
+ if deps.any? { |dep| !dep.recommended? && !dep.optional? }
+ [] # Means required dependency.
+ elsif deps.any?(&:recommended?)
+ [:recommended]
+ else # deps.all?(&:optional?)
+ [:optional]
+ end
+ end
+
+ def merge_temporality(deps)
+ if deps.all?(&:build?)
+ [:build]
+ elsif deps.all?(&:run?)
+ [:run]
+ else
+ [] # Means both build and runtime dependency.
+ end
+ end
end
end