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

CurlDownloadStrategy: dup mirror list before mutating it

Browse Source
This commit is contained in:
Jack Nagel 2013-10-11 18:56:38 -05:00
parent 28a20b70fc
commit 284a3716ea
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/download_strategy.rb
View File

@ -67,9 +67,8 @@ class VCSDownloadStrategy < AbstractDownloadStrategy
end end
class CurlDownloadStrategy < AbstractDownloadStrategy class CurlDownloadStrategy < AbstractDownloadStrategy
def initialize name, resource def mirrors
super @mirrors ||= resource.mirrors.dup
@mirrors = resource.mirrors
end end
def tarball_path def tarball_path
@ -120,9 +119,9 @@ class CurlDownloadStrategy < AbstractDownloadStrategy
puts "Already downloaded: #{tarball_path}" puts "Already downloaded: #{tarball_path}"
end end
rescue CurlDownloadStrategyError rescue CurlDownloadStrategyError
raise if @mirrors.empty? raise if mirrors.empty?
puts "Trying a mirror..." puts "Trying a mirror..."
@url = @mirrors.shift @url = mirrors.shift
retry retry
else else
tarball_path tarball_path
@ -170,7 +169,7 @@ class CurlDownloadStrategy < AbstractDownloadStrategy
private private
def curl(*args) def curl(*args)
args << '--connect-timeout' << '5' unless @mirrors.empty? args << '--connect-timeout' << '5' unless mirrors.empty?
super super
end end

3
Library/Homebrew/test/test_resource.rb
View File

@ -75,8 +75,7 @@ class ResourceTests < Test::Unit::TestCase
assert_empty @resource.mirrors assert_empty @resource.mirrors
@resource.mirror('foo') @resource.mirror('foo')
@resource.mirror('bar') @resource.mirror('bar')
assert_equal 'foo', @resource.mirrors.shift assert_equal %w{foo bar}, @resource.mirrors
assert_equal 'bar', @resource.mirrors.shift
end end
def test_checksum_setters def test_checksum_setters