aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-02-10 20:07:08 -0600
committerJack Nagel2013-02-10 20:10:15 -0600
commit3bead6c7531f341d437fdda922cc41553bca0517 (patch)
treeff07ddddfa0787f936a9bb5e5f5ae056a0813ed7 /Library
parent4e500f4888525d18afccdec9e076a6c757006539 (diff)
downloadhomebrew-3bead6c7531f341d437fdda922cc41553bca0517.tar.bz2
CurlDownloadStrategy: remove pointless type introspection
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/download_strategy.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index af3e089ad..6ac225331 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -73,23 +73,20 @@ class CurlDownloadStrategy < AbstractDownloadStrategy
unless @tarball_path.exist?
begin
_fetch
- rescue Exception => e
- if e.kind_of? ErrorDuringExecution
- raise CurlDownloadStrategyError, "Download failed: #{@url}"
- else
- raise
- end
+ rescue ErrorDuringExecution
+ raise CurlDownloadStrategyError, "Download failed: #{@url}"
end
ignore_interrupts { @temporary_path.rename(@tarball_path) }
else
puts "Already downloaded: #{@tarball_path}"
end
- return @tarball_path # thus performs checksum verification
rescue CurlDownloadStrategyError
raise if @mirrors.empty?
puts "Trying a mirror..."
@url = @mirrors.shift
retry
+ else
+ @tarball_path
end
def stage