admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

cleaner: reorganize clean_dir to avoid repeated conditional

Browse Source
This commit is contained in:
Jack Nagel 2013-12-22 13:43:50 -06:00
parent 676f29d757
commit 095d83d10b
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/cleaner.rb
View File

@ -74,21 +74,17 @@ class Cleaner
d.find do |path| d.find do |path|
path.extend(NoisyPathname) if ARGV.verbose? path.extend(NoisyPathname) if ARGV.verbose?
if path.directory?
# Stop cleaning this subtree if protected
Find.prune if @f.skip_clean? path Find.prune if @f.skip_clean? path
elsif not path.file?
# Sanity? if path.symlink? or path.directory?
next next
elsif path.extname == '.la' elsif path.extname == '.la'
# *.la files are stupid path.unlink
path.unlink unless @f.skip_clean? path
elsif path == @f.lib+'charset.alias' elsif path == @f.lib+'charset.alias'
# Many formulae symlink this file, but it is not strictly needed # Many formulae symlink this file, but it is not strictly needed
path.unlink unless @f.skip_clean? path path.unlink
elsif not path.symlink? else
# Fix permissions clean_file_permissions(path)
clean_file_permissions(path) unless @f.skip_clean? path
end end
end end
end end