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

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

Browse Source
This commit is contained in:
Rylan Polster 2021-05-31 02:46:45 -04:00
parent cbb788bd17
commit 70d020b6b3
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/requirement.rb
View File

@ -223,7 +223,7 @@ class Requirement
def expand(dependent, cache_key: nil, &block)
if cache_key.present?
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
reqs = Requirements.new
@ -239,7 +239,7 @@ class Requirement
end
end
cache[cache_key][dependent.full_name] = reqs.dup if cache_key.present?
cache[cache_key][cache_id dependent] = reqs.dup if cache_key.present?
reqs
end
@ -258,5 +258,11 @@ class Requirement
def prune
throw(:prune, true)
end
private
def cache_id(dependent)
"#{dependent.full_name}_#{dependent.class}"
end
end
end