diff options
| author | Adam Vandenberg | 2014-02-23 17:39:01 -0800 |
|---|---|---|
| committer | Adam Vandenberg | 2014-02-25 20:24:34 -0800 |
| commit | 691c8bbd3ec65d4fbf28d41645c33fdadf56be41 (patch) | |
| tree | b01ff5d4427c31cf8cba8c7a44f25c69681aafbf | |
| parent | 123d6ec2721cecedded799580bfaa236679c3c1f (diff) | |
| download | homebrew-691c8bbd3ec65d4fbf28d41645c33fdadf56be41.tar.bz2 | |
remove charset.alias directly
| -rw-r--r-- | Library/Homebrew/cleaner.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb index d22e70cc1..3fa3bb6f6 100644 --- a/Library/Homebrew/cleaner.rb +++ b/Library/Homebrew/cleaner.rb @@ -13,6 +13,12 @@ class Cleaner # Clean the keg of formula @f def clean ObserverPathnameExtension.reset_counts! + + # Many formulae include 'lib/charset.alias', but it is not strictly needed + # and will conflict if more than one formula provides it + alias_path = @f.lib/'charset.alias' + alias_path.extend(ObserverPathnameExtension).unlink if alias_path.exist? + [@f.bin, @f.sbin, @f.lib].select{ |d| d.exist? }.each{ |d| clean_dir d } # Get rid of any info 'dir' files, so they don't conflict at the link stage @@ -30,7 +36,6 @@ class Cleaner def prune dirs = [] symlinks = [] - @f.prefix.find do |path| if @f.skip_clean? path Find.prune @@ -80,9 +85,6 @@ class Cleaner next elsif path.extname == '.la' path.unlink - elsif path == @f.lib+'charset.alias' - # Many formulae symlink this file, but it is not strictly needed - path.unlink else clean_file_permissions(path) end |