bottle: fail if bottle is disabled
This commit is contained in:
parent
975771ab35
commit
d20d08b5fe
@ -145,6 +145,12 @@ module Homebrew
|
|||||||
return ofail "Formula not installed or up-to-date: #{f.full_name}"
|
return ofail "Formula not installed or up-to-date: #{f.full_name}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if f.bottle_disabled?
|
||||||
|
ofail "Formula has disabled bottle: #{f.full_name}"
|
||||||
|
puts f.bottle_disable_reason
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
unless built_as_bottle? f
|
unless built_as_bottle? f
|
||||||
return ofail "Formula not installed with '--build-bottle': #{f.full_name}"
|
return ofail "Formula not installed with '--build-bottle': #{f.full_name}"
|
||||||
end
|
end
|
||||||
@ -288,6 +294,12 @@ module Homebrew
|
|||||||
ohai formula_name
|
ohai formula_name
|
||||||
f = Formulary.factory(formula_name)
|
f = Formulary.factory(formula_name)
|
||||||
|
|
||||||
|
if f.bottle_disabled?
|
||||||
|
ofail "Formula #{f.full_name} has disabled bottle"
|
||||||
|
puts f.bottle_disable_reason
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
bottle = if keep_old
|
bottle = if keep_old
|
||||||
f.bottle_specification.dup
|
f.bottle_specification.dup
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user