pull: more formulae fetch outside of main loop.

Closes Homebrew/homebrew#43313.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Mike McQuaid 2015-08-27 13:39:29 +01:00
parent 451c69d9bd
commit 59bd08e992

View File

@ -198,22 +198,6 @@ module Homebrew
end
end
bintray_fetch_formulae.each do |f|
max_retries = 5
retry_count = 0
begin
success = system "brew", "fetch", "--force-bottle", f.full_name
raise "Failed to download #{f} bottle!" unless success
rescue RuntimeError => e
retry_count += 1
raise e if retry_count >= max_retries
sleep_seconds = 2**retry_count
ohai "That didn't work; sleeping #{sleep_seconds} seconds and trying again..."
sleep sleep_seconds
retry
end
end
ohai "Patch changed:"
safe_system "git", "diff-tree", "-r", "--stat", revision, "HEAD"
@ -225,5 +209,21 @@ module Homebrew
end
end
end
bintray_fetch_formulae.each do |f|
max_retries = 5
retry_count = 0
begin
success = system "brew", "fetch", "--force-bottle", f.full_name
raise "Failed to download #{f} bottle!" unless success
rescue RuntimeError => e
retry_count += 1
raise e if retry_count >= max_retries
sleep_seconds = 2**retry_count
ohai "That didn't work; sleeping #{sleep_seconds} seconds and trying again..."
sleep sleep_seconds
retry
end
end
end
end