diff options
| author | Jack Nagel | 2014-03-24 10:28:49 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-03-24 11:00:55 -0500 |
| commit | a72061c59a6323f6ea2520a5f194a0e02ae59752 (patch) | |
| tree | aea6cf252cd98a0148b0c45bfb9d296b3cecd382 /Library | |
| parent | e4f291084aaa97cad176f13268420b2fbc899ab0 (diff) | |
| download | brew-a72061c59a6323f6ea2520a5f194a0e02ae59752.tar.bz2 | |
Check existence of target keg instead of hiding exceptions
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 98406bf6e..ece2431ff 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) rescue nil + outdated_keg = Keg.new(f.linked_keg.realpath) if f.linked_keg.directory? fi = FormulaInstaller.new(f) fi.options = Tab.for_formula(f).used_options diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index a61683a5a..f1612e8d4 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -351,7 +351,7 @@ class FormulaInstaller def install_dependency(dep, inherited_options) df = dep.to_formula - outdated_keg = Keg.new(df.linked_keg.realpath) rescue nil + outdated_keg = Keg.new(df.linked_keg.realpath) if df.linked_keg.directory? fi = DependencyInstaller.new(df) fi.options |= Tab.for_formula(df).used_options |