From 418b751aca2da41be58263e1f847d2c315070923 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 10 Dec 2013 21:32:29 +0000 Subject: [PATCH] brew-test-bot: only merge bottles if copy succeeds. --- Library/Contributions/cmd/brew-test-bot.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index b99da09cf2..919b81ab5f 100755 --- a/Library/Contributions/cmd/brew-test-bot.rb +++ b/Library/Contributions/cmd/brew-test-bot.rb @@ -417,7 +417,8 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload' raise "Missing Jenkins variables!" unless jenkins and job and id ARGV << '--verbose' - safe_system "cp #{jenkins}/jobs/\"#{job}\"/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.* ." + copied = system "cp #{jenkins}/jobs/\"#{job}\"/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.* ." + exit unless copied safe_system "brew bottle --merge --write *.bottle*.rb" remote = "git@github.com:BrewTestBot/homebrew.git" @@ -432,7 +433,7 @@ if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload' safe_system "rsync #{options} *.bottle.tar.gz #{url}" safe_system "git tag --force #{tag}" safe_system "git push --force #{remote} refs/tags/#{tag}" - exit 0 + exit end tests = []