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

cleanup: raise failures and handle later.

Browse Source 
These are already handled and outputted as a group in `cmd/cleanup.rb`.

Fixes https://github.com/Homebrew/brew/issues/10379
This commit is contained in:
Mike McQuaid 2021-01-21 13:03:52 +00:00
parent c7e9fdc839
commit 15761a283d
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cleanup.rb
View File

@ -249,7 +249,7 @@ module Homebrew
end end
def cleanup_keg(keg) def cleanup_keg(keg)
cleanup_path(keg) { keg.uninstall } cleanup_path(keg) { keg.uninstall(raise_failures: true) }
rescue Errno::EACCES => e rescue Errno::EACCES => e
opoo e.message opoo e.message
unremovable_kegs << keg unremovable_kegs << keg

4
Library/Homebrew/keg.rb
View File

@ -319,7 +319,7 @@ class Keg
opt_record.parent.rmdir_if_possible opt_record.parent.rmdir_if_possible
end end
def uninstall def uninstall(raise_failures: false)
CacheStoreDatabase.use(:linkage) do |db| CacheStoreDatabase.use(:linkage) do |db|
break unless db.created? break unless db.created?
@ -333,6 +333,8 @@ class Keg
remove_old_aliases remove_old_aliases
remove_oldname_opt_record remove_oldname_opt_record
rescue Errno::EACCES, Errno::ENOTEMPTY rescue Errno::EACCES, Errno::ENOTEMPTY
raise if raise_failures
odie <<~EOS odie <<~EOS
Could not remove #{name} keg! Do so manually: Could not remove #{name} keg! Do so manually:
sudo rm -rf #{path} sudo rm -rf #{path}