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

cleanup: fix for formula/cask name collision

Browse Source 
When a formula and cask share the same name, a download can be
incorrectly considered stale. Only check for if a download is a stale
formula or stale cask, but not both.
This commit is contained in:
Chase Stubblefield 2019-03-05 19:41:58 -08:00
parent db68e7e3c1
commit 2c95d733c2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cleanup.rb
View File

@ -59,7 +59,11 @@ module CleanupRefinement
def stale?(scrub = false) def stale?(scrub = false)
return false unless resolved_path.file? return false unless resolved_path.file?
stale_formula?(scrub) || stale_cask?(scrub) if dirname.basename.to_s == "Cask"
stale_cask?(scrub)
else
stale_formula?(scrub)
end
end end
private private
@ -113,8 +117,6 @@ module CleanupRefinement
def stale_cask?(scrub) def stale_cask?(scrub)
return false unless name = basename.to_s[/\A(.*?)\-\-/, 1] return false unless name = basename.to_s[/\A(.*?)\-\-/, 1]
return if dirname.basename.to_s != "Cask"
cask = begin cask = begin
Cask::CaskLoader.load(name) Cask::CaskLoader.load(name)
rescue Cask::CaskUnavailableError rescue Cask::CaskUnavailableError