aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2012-03-09 12:37:23 -0600
committerJack Nagel2012-03-09 12:41:22 -0600
commitd60f4ffcd80a984018c61f9ca60269d42a055bf8 (patch)
tree15c003dfae02ef03b203a4627d5fedf217508190 /Library
parentfe25e4f7ec27ba66ad6eab2e26c9567e2419cc81 (diff)
downloadbrew-d60f4ffcd80a984018c61f9ca60269d42a055bf8.tar.bz2
Restore cleaning of lib/charset.alias
Even though we now prevent linking of this file into the prefix in Keg#link, its presence still triggers a "non-lib in lib" warning during installation. So keep cleaning it, and leave the check in Keg#link so things that skip_clean 'lib' still won't have it linked. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cleaner.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index 14a69c3ae..ea5ece779 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -78,6 +78,8 @@ class Cleaner
elsif path.extname == '.la'
# *.la files are stupid
path.unlink unless @f.skip_clean? path
+ elsif path == @f.lib+'charset.alias'
+ path.unlink unless @f.skip_clean? path
elsif not path.symlink?
clean_file path
end