diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index bbcfd1615d..a4ad05f392 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -128,8 +128,17 @@ module Homebrew end end - unless ARGV.include? "--bottle" - changed_formulae.each do |f| + fetch_bottles = false + changed_formulae.each do |f| + if ARGV.include? "--bottle" + if f.bottle + fetch_bottles = true + elsif f.bottle_disabled? + ohai "#{f}: skipping disabled bottle: #{f.bottle_disable_reason}" + elsif f.bottle_unneeded? + ohai "#{f}: skipping unneeded bottle." + end + else next unless f.bottle opoo "#{f.full_name} has a bottle: do you need to update it with --bottle?" end @@ -155,8 +164,7 @@ module Homebrew end end - if ARGV.include? "--bottle" - + if fetch_bottles bottle_commit_url = if testing_job bottle_branch = "testing-bottle-#{testing_job}" url