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

dependency: don't merge formula and cask cache in ::expand

Browse Source
This commit is contained in:
Rylan Polster 2021-05-29 18:08:42 -04:00
parent eeef3f4fe7
commit cbb788bd17
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dependency.rb
View File

@ -96,7 +96,7 @@ class Dependency
if cache_key.present? if cache_key.present?
cache[cache_key] ||= {} cache[cache_key] ||= {}
return cache[cache_key][dependent.full_name].dup if cache[cache_key][dependent.full_name] return cache[cache_key][cache_id dependent].dup if cache[cache_key][cache_id dependent]
end end
expanded_deps = [] expanded_deps = []
@ -122,7 +122,7 @@ class Dependency
end end
expanded_deps = merge_repeats(expanded_deps) expanded_deps = merge_repeats(expanded_deps)
cache[cache_key][dependent.full_name] = expanded_deps.dup if cache_key.present? cache[cache_key][cache_id dependent] = expanded_deps.dup if cache_key.present?
expanded_deps expanded_deps
ensure ensure
@expand_stack.pop @expand_stack.pop
@ -170,6 +170,10 @@ class Dependency
private private
def cache_id(dependent)
"#{dependent.full_name}_#{dependent.class}"
end
def merge_tags(deps) def merge_tags(deps)
other_tags = deps.flat_map(&:option_tags).uniq other_tags = deps.flat_map(&:option_tags).uniq
other_tags << :test if deps.flat_map(&:tags).include?(:test) other_tags << :test if deps.flat_map(&:tags).include?(:test)