test-bot: allow bottle --merge to fail.

It may still write some bottles so let's allow them to be uploaded.
This commit is contained in:
Mike McQuaid 2015-09-21 14:01:19 +01:00
parent 76488216b7
commit 036aab567d

View File

@ -789,7 +789,7 @@ module Homebrew
bottle_args = ["--merge", "--write", *Dir["*.bottle.rb"]]
bottle_args << "--tap=#{tap}" if tap
bottle_args << "--keep-old" if ARGV.include? "--keep-old"
safe_system "brew", "bottle", *bottle_args
system "brew", "bottle", *bottle_args
remote_repo = tap ? "homebrew-#{tap.repo}" : "homebrew"
remote = "git@github.com:BrewTestBot/#{remote_repo}.git"