admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Avoid explicit control flow

Browse Source
This commit is contained in:
Jack Nagel 2015-05-12 20:33:34 -04:00
parent fca020cde1
commit e04e898d5c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/formula_installer.rb
View File

@ -196,12 +196,13 @@ class FormulaInstaller
conflicts = formula.conflicts.select do |c| conflicts = formula.conflicts.select do |c|
begin begin
f = Formulary.factory(c.name) f = Formulary.factory(c.name)
f.linked_keg.exist? && f.opt_prefix.exist?
rescue TapFormulaUnavailableError rescue TapFormulaUnavailableError
# If the formula name is in full-qualified name. Let's silently # 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 # ignore it as we don't care about things used in taps that aren't
# currently tapped. # currently tapped.
next false
else
f.linked_keg.exist? && f.opt_prefix.exist?
end end
end end