From 8e2b8c1419c7c95274dae4e012a1068301676ffd Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sun, 10 Feb 2013 20:07:08 -0600
Subject: CurlDownloadStrategy: remove pointless type introspection

---
 Library/Homebrew/download_strategy.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Library')

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
-- 
cgit v1.2.3