From a26601dc2b9ef33491e0df50e64899b823c56b78 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sat, 5 Apr 2014 12:17:19 -0500
Subject: 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.
---
 Library/Homebrew/cmd/reinstall.rb | 4 ++--
 Library/Homebrew/cmd/upgrade.rb   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Library/Homebrew/cmd')

diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 393662b0c..24bffc5c5 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -13,8 +13,8 @@ module Homebrew extend self
     notice += " with #{options * ", "}" unless options.empty?
     oh1 notice
 
-    if (opt_link = f.opt_prefix).exist?
-      keg = Keg.new(opt_link.realpath)
+    if f.opt_prefix.directory?
+      keg = Keg.new(f.opt_prefix.resolved_path)
       backup keg
     end
 
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index ece2431ff..205de517d 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -54,7 +54,7 @@ module Homebrew extend self
   end
 
   def upgrade_formula f
-    outdated_keg = Keg.new(f.linked_keg.realpath) if f.linked_keg.directory?
+    outdated_keg = Keg.new(f.linked_keg.resolved_path) if f.linked_keg.directory?
 
     fi = FormulaInstaller.new(f)
     fi.options             = Tab.for_formula(f).used_options
-- 
cgit v1.2.3