Revert 66a4ea1c80fa36fe348b3d5ad6d2f6c61cf21c05
Refusing to unlink files from another keg introduced issues when files changed between formula versions; for instance, this introduced issues when upgrading from gtk+ 2.24.10 to 2.24.11. See Homebrew/homebrew#12778.
This commit is contained in:
parent
5de94e48bd
commit
70d7c0c122
@ -35,12 +35,7 @@ class Keg < Pathname
|
||||
src.find do |src|
|
||||
next if src == self
|
||||
dst=HOMEBREW_PREFIX+src.relative_path_from(self)
|
||||
|
||||
# check whether the file to be unlinked is from the current keg first
|
||||
if !dst.symlink? || !dst.exist? || src.expand_path != dst.realpath
|
||||
next
|
||||
end
|
||||
|
||||
next unless dst.symlink?
|
||||
dst.uninstall_info if dst.to_s =~ INFOFILE_RX and ENV['HOMEBREW_KEEP_INFO']
|
||||
dst.unlink
|
||||
dst.parent.rmdir_if_possible
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user