From 02f66b5ef7ff339a3ac68f6d87b749674fef0a75 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Tue, 24 Jul 2012 09:40:20 -0500 Subject: 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 #12778. --- Library/Homebrew/keg.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 0d9a12cc6..fb6996cdd 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -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 -- cgit v1.2.3