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

Pull conditional out of begin block

Browse Source
This commit is contained in:
Jack Nagel 2014-10-17 22:41:26 -05:00
parent ca2680d77f
commit 41cc28ca42
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/formula_installer.rb
View File

@ -154,16 +154,17 @@ class FormulaInstaller
@@attempted << f @@attempted << f
if pour_bottle?(:warn => true)
begin begin
if pour_bottle? :warn => true
pour pour
@poured_bottle = true
end
rescue => e rescue => e
raise e if ARGV.homebrew_developer? raise if ARGV.homebrew_developer?
@pour_failed = true @pour_failed = true
onoe e.message onoe e.message
opoo "Bottle installation failed: building from source." opoo "Bottle installation failed: building from source."
else
@poured_bottle = true
end
end end
build_bottle_preinstall if build_bottle? build_bottle_preinstall if build_bottle?