admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

pull: handle unneeded and disabled bottles.

Browse Source 
Closes Homebrew/homebrew#45563.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Mike McQuaid 2015-10-31 20:17:15 -07:00
parent 4a9960bee7
commit 18b2d0150e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/cmd/pull.rb
View File

@ -128,8 +128,17 @@ module Homebrew
end end
end end
unless ARGV.include? "--bottle" fetch_bottles = false
changed_formulae.each do |f| 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 next unless f.bottle
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
@ -155,8 +164,7 @@ module Homebrew
end end
end end
if ARGV.include? "--bottle" if fetch_bottles
bottle_commit_url = if testing_job bottle_commit_url = if testing_job
bottle_branch = "testing-bottle-#{testing_job}" bottle_branch = "testing-bottle-#{testing_job}"
url url