pull: remove legacy retry block.

This commit is contained in:
Mike McQuaid 2016-05-28 20:12:00 +01:00
parent 7829af7508
commit 60cb841ddb

View File

@ -190,15 +190,7 @@ module Homebrew
"https://github.com/BrewTestBot/homebrew-#{tap.repo}/compare/homebrew:master...pr-#{issue}" "https://github.com/BrewTestBot/homebrew-#{tap.repo}/compare/homebrew:master...pr-#{issue}"
end end
bottle_commit_fallbacked = false
begin
curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url curl "--silent", "--fail", "-o", "/dev/null", "-I", bottle_commit_url
rescue ErrorDuringExecution
raise if bottle_commit_fallbacked
bottle_commit_url = "https://github.com/BrewTestBot/homebrew/compare/homebrew:master...pr-#{issue}"
bottle_commit_fallbacked = true
retry
end
safe_system "git", "checkout", "--quiet", "-B", bottle_branch, orig_revision safe_system "git", "checkout", "--quiet", "-B", bottle_branch, orig_revision
pull_patch bottle_commit_url, "bottle commit" pull_patch bottle_commit_url, "bottle commit"