pull: handle unneeded and disabled bottles.
Closes Homebrew/homebrew#45563. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
parent
4a9960bee7
commit
18b2d0150e
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user