Pull conditional out of begin block
This commit is contained in:
parent
ca2680d77f
commit
41cc28ca42
@ -154,16 +154,17 @@ class FormulaInstaller
|
|||||||
|
|
||||||
@@attempted << f
|
@@attempted << f
|
||||||
|
|
||||||
begin
|
if pour_bottle?(:warn => true)
|
||||||
if pour_bottle? :warn => true
|
begin
|
||||||
pour
|
pour
|
||||||
|
rescue => e
|
||||||
|
raise if ARGV.homebrew_developer?
|
||||||
|
@pour_failed = true
|
||||||
|
onoe e.message
|
||||||
|
opoo "Bottle installation failed: building from source."
|
||||||
|
else
|
||||||
@poured_bottle = true
|
@poured_bottle = true
|
||||||
end
|
end
|
||||||
rescue => e
|
|
||||||
raise e if ARGV.homebrew_developer?
|
|
||||||
@pour_failed = true
|
|
||||||
onoe e.message
|
|
||||||
opoo "Bottle installation failed: building from source."
|
|
||||||
end
|
end
|
||||||
|
|
||||||
build_bottle_preinstall if build_bottle?
|
build_bottle_preinstall if build_bottle?
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user