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

Pathname#extname returns a string

Browse Source
This commit is contained in:
Jack Nagel 2013-12-14 09:35:57 -06:00
parent 5994fd469c
commit 935091cd8e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/keg.rb
View File

@ -246,7 +246,7 @@ class Keg < Pathname
Find.prune if File.basename(src) == '.DS_Store' Find.prune if File.basename(src) == '.DS_Store'
# Don't link pyc files because Python overwrites these cached object # Don't link pyc files because Python overwrites these cached object
# files and next time brew wants to link, the pyc file is in the way. # files and next time brew wants to link, the pyc file is in the way.
if src.extname.to_s == '.pyc' && src.to_s =~ /site-packages/ if src.extname == '.pyc' && src.to_s =~ /site-packages/
Find.prune Find.prune
end end
@ -274,7 +274,7 @@ class Keg < Pathname
next if dst.directory? and not dst.symlink? next if dst.directory? and not dst.symlink?
# no need to put .app bundles in the path, the user can just use # no need to put .app bundles in the path, the user can just use
# spotlight, or the open command and actual mac apps use an equivalent # spotlight, or the open command and actual mac apps use an equivalent
Find.prune if src.extname.to_s == '.app' Find.prune if src.extname == '.app'
case yield src.relative_path_from(root) case yield src.relative_path_from(root)
when :skip_dir when :skip_dir

4
Library/Homebrew/keg_fix_install_names.rb
View File

@ -175,7 +175,7 @@ class Keg
pc_dir = self/'lib/pkgconfig' pc_dir = self/'lib/pkgconfig'
if pc_dir.directory? if pc_dir.directory?
pc_dir.find do |pn| pc_dir.find do |pn|
next if pn.symlink? or pn.directory? or pn.extname.to_s != '.pc' next if pn.symlink? or pn.directory? or pn.extname != '.pc'
pkgconfig_files << pn pkgconfig_files << pn
end end
end end
@ -194,7 +194,7 @@ class Keg
# find .la files, which are stored in lib/ # find .la files, which are stored in lib/
la_dir = self/'lib' la_dir = self/'lib'
la_dir.find do |pn| la_dir.find do |pn|
next if pn.symlink? or pn.directory? or pn.extname.to_s != '.la' next if pn.symlink? or pn.directory? or pn.extname != '.la'
libtool_files << pn libtool_files << pn
end end
libtool_files libtool_files