aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/keg.rb
diff options
context:
space:
mode:
authorJack Nagel2014-04-05 12:17:19 -0500
committerJack Nagel2014-04-05 12:17:19 -0500
commita26601dc2b9ef33491e0df50e64899b823c56b78 (patch)
tree767f896aea23999a5f4b0598298f5bd08609b573 /Library/Homebrew/keg.rb
parentbfeb0a491345bbe231de7009f6b6d8fe8d17634b (diff)
downloadhomebrew-a26601dc2b9ef33491e0df50e64899b823c56b78.tar.bz2
Avoid realpath where it is not necessary
Symlinks in opt and LinkedKegs point directly at a keg in the cellar, so only resolving one symlink should suffice, and make it clear what path we are actually interested in.
Diffstat (limited to 'Library/Homebrew/keg.rb')
-rw-r--r--Library/Homebrew/keg.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 3ec28136c..2287df465 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -87,7 +87,7 @@ class Keg < Pathname
end
def linked?
- linked_keg_record.directory? and self == linked_keg_record.realpath
+ linked_keg_record.directory? && self == linked_keg_record.resolved_path
end
def completion_installed? shell
@@ -125,7 +125,7 @@ class Keg < Pathname
end
def link mode=OpenStruct.new
- raise "Cannot link #{fname}\nAnother version is already linked: #{linked_keg_record.realpath}" if linked_keg_record.directory?
+ raise "Cannot link #{fname}\nAnother version is already linked: #{linked_keg_record.resolved_path}" if linked_keg_record.directory?
ObserverPathnameExtension.reset_counts!