From 18b2d0150e039a13437cc27eeeada8c529fa0d18 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 31 Oct 2015 20:17:15 -0700 Subject: [PATCH] pull: handle unneeded and disabled bottles. Closes Homebrew/homebrew#45563. Signed-off-by: Mike McQuaid --- Library/Homebrew/cmd/pull.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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