From ca0eff67faaa3193ca05ee14f9d0af6797dd2a52 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Tue, 18 Feb 2014 13:27:35 -0500
Subject: Inline static exception text to remove a rescue

---
 Library/Homebrew/exceptions.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'Library/Homebrew/exceptions.rb')

diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index b03896669..66123d9f0 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -240,24 +240,20 @@ class ChecksumMissingError < ArgumentError; end
 
 # raised by Pathname#verify_checksum when verification fails
 class ChecksumMismatchError < RuntimeError
-  attr_accessor :advice
-  attr_reader :expected, :actual, :hash_type
+  attr_reader :expected, :hash_type
 
-  def initialize expected, actual
+  def initialize fn, expected, actual
     @expected = expected
-    @actual = actual
     @hash_type = expected.hash_type.to_s.upcase
 
     super <<-EOS.undent
       #{@hash_type} mismatch
-      Expected: #{@expected}
-      Actual: #{@actual}
+      Expected: #{expected}
+      Actual: #{actual}
+      Archive: #{fn}
+      To retry an incomplete download, remove the file above.
       EOS
   end
-
-  def to_s
-    super + advice.to_s
-  end
 end
 
 class ResourceMissingError < ArgumentError
-- 
cgit v1.2.3