pull: use bottle_defined?

Fixes Homebrew/homebrew#45575

Closes Homebrew/homebrew#45577.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Xu Cheng 2015-11-01 20:34:08 +08:00 committed by Mike McQuaid
parent ff9fdc078f
commit ae329a802b

View File

@ -131,7 +131,7 @@ module Homebrew
fetch_bottles = false fetch_bottles = false
changed_formulae.each do |f| changed_formulae.each do |f|
if ARGV.include? "--bottle" if ARGV.include? "--bottle"
if f.bottle if f.bottle_defined?
fetch_bottles = true fetch_bottles = true
elsif f.bottle_unneeded? elsif f.bottle_unneeded?
ohai "#{f}: skipping unneeded bottle." ohai "#{f}: skipping unneeded bottle."
@ -139,7 +139,7 @@ module Homebrew
ohai "#{f}: skipping disabled bottle: #{f.bottle_disable_reason}" ohai "#{f}: skipping disabled bottle: #{f.bottle_disable_reason}"
end end
else else
next unless f.bottle next unless f.bottle_defined?
opoo "#{f.full_name} has a bottle: do you need to update it with --bottle?" opoo "#{f.full_name} has a bottle: do you need to update it with --bottle?"
end end
end end