aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2013-12-14 09:35:57 -0600
committerJack Nagel2013-12-14 09:35:57 -0600
commit2f78af07ca2c8c931c0a431d1bf43aeb73d5f661 (patch)
treeefc5632be497c89afda0f231482ce953cc60222f
parent6beceadfed810346d0b544620a863c9da580bf26 (diff)
downloadhomebrew-2f78af07ca2c8c931c0a431d1bf43aeb73d5f661.tar.bz2
Pathname#extname returns a string
-rw-r--r--Library/Homebrew/keg.rb4
-rw-r--r--Library/Homebrew/keg_fix_install_names.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 5fbfa9f69..e1178d5dd 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -246,7 +246,7 @@ class Keg < Pathname
Find.prune if File.basename(src) == '.DS_Store'
# 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.
- if src.extname.to_s == '.pyc' && src.to_s =~ /site-packages/
+ if src.extname == '.pyc' && src.to_s =~ /site-packages/
Find.prune
end
@@ -274,7 +274,7 @@ class Keg < Pathname
next if dst.directory? and not dst.symlink?
# 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
- Find.prune if src.extname.to_s == '.app'
+ Find.prune if src.extname == '.app'
case yield src.relative_path_from(root)
when :skip_dir
diff --git a/Library/Homebrew/keg_fix_install_names.rb b/Library/Homebrew/keg_fix_install_names.rb
index 99726166c..d382b2a3e 100644
--- a/Library/Homebrew/keg_fix_install_names.rb
+++ b/Library/Homebrew/keg_fix_install_names.rb
@@ -175,7 +175,7 @@ class Keg
pc_dir = self/'lib/pkgconfig'
if pc_dir.directory?
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
end
end
@@ -194,7 +194,7 @@ class Keg
# find .la files, which are stored in lib/
la_dir = self/'lib'
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
end
libtool_files