diff options
| author | Misty De Meo | 2012-07-24 09:40:20 -0500 |
|---|---|---|
| committer | Misty De Meo | 2012-07-24 09:52:12 -0500 |
| commit | 70d7c0c12297a4a92c61c9dfc5082ce53fb03d20 (patch) | |
| tree | 0f80e304152014f0de3d2f5a9d882297e4ee2bfe /Library | |
| parent | 5de94e48bdea7ebb7fc23089a7d01800f82d046b (diff) | |
| download | brew-70d7c0c12297a4a92c61c9dfc5082ce53fb03d20.tar.bz2 | |
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.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/keg.rb | 7 |
1 files changed, 1 insertions, 6 deletions
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 |