remove charset.alias directly

This commit is contained in:
Adam Vandenberg 2014-02-23 17:39:01 -08:00
parent d848a6c5fd
commit 3a4a529453

View File

@ -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