aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2015-05-12 20:33:34 -0400
committerJack Nagel2015-05-12 20:33:34 -0400
commite04e898d5c9b5c3c726ceb769a0e63246ed90ddc (patch)
tree8dcb57f15e595651261aef176473f2814506a613 /Library
parentfca020cde12537566ea22136a719faf38a89da3c (diff)
downloadbrew-e04e898d5c9b5c3c726ceb769a0e63246ed90ddc.tar.bz2
Avoid explicit control flow
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula_installer.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index d3b28d00d..3ee3062a5 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -196,12 +196,13 @@ class FormulaInstaller
conflicts = formula.conflicts.select do |c|
begin
f = Formulary.factory(c.name)
- f.linked_keg.exist? && f.opt_prefix.exist?
rescue TapFormulaUnavailableError
# If the formula name is in full-qualified name. Let's silently
# ignore it as we don't care about things used in taps that aren't
# currently tapped.
- next
+ false
+ else
+ f.linked_keg.exist? && f.opt_prefix.exist?
end
end