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

Merge pull request #1922 from MikeMcQuaid/pull-missing-bottles

Browse Source 
pull: better handle missing bottles.
This commit is contained in:
Mike McQuaid 2017-01-27 14:13:57 +00:00 committed by GitHub
commit e8148c3b4f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/dev-cmd/pull.rb
View File

@ -248,7 +248,6 @@ module Homebrew
changed_formulae_names.each do |name| changed_formulae_names.each do |name|
f = Formula[name] f = Formula[name]
next if f.bottle_unneeded? || f.bottle_disabled? next if f.bottle_unneeded? || f.bottle_disabled?
ohai "Publishing on Bintray: #{f.name} #{f.pkg_version}"
publish_bottle_file_on_bintray(f, bintray_creds) publish_bottle_file_on_bintray(f, bintray_creds)
published << f.full_name published << f.full_name
end end
@ -408,7 +407,12 @@ module Homebrew
if info.nil? if info.nil?
raise "Failed publishing bottle: failed reading formula info for #{f.full_name}" raise "Failed publishing bottle: failed reading formula info for #{f.full_name}"
end end
unless info.bottle_info_any
opoo "No bottle defined in formula #{package}"
return
end
version = info.pkg_version version = info.pkg_version
ohai "Publishing on Bintray: #{package} #{version}"
curl "-w", '\n', "--silent", "--fail", curl "-w", '\n', "--silent", "--fail",
"-u#{creds[:user]}:#{creds[:key]}", "-X", "POST", "-u#{creds[:user]}:#{creds[:key]}", "-X", "POST",
"-H", "Content-Type: application/json", "-H", "Content-Type: application/json",