diff options
| author | Jack Nagel | 2014-04-05 12:17:19 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-05 12:17:19 -0500 |
| commit | a26601dc2b9ef33491e0df50e64899b823c56b78 (patch) | |
| tree | 767f896aea23999a5f4b0598298f5bd08609b573 /Library/Homebrew/cmd | |
| parent | bfeb0a491345bbe231de7009f6b6d8fe8d17634b (diff) | |
| download | homebrew-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/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/reinstall.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 2 |
2 files changed, 3 insertions, 3 deletions
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 |
