From 305fca250edb75d31f38a920e331eb4db9b2aaa3 Mon Sep 17 00:00:00 2001
From: Yarrow <yarrow@egg-in-the-hollow.com>
Date: Sun, 2 May 2010 15:21:56 -0400
Subject: [PATCH] Show digest mismatch in verify_download_integrity

Report "Expected <supplied digest>, got <file's digest>"
when verify_download_integrity sees a mismatch.  (It had
been, confusingly, reporting "Expected <file's digest>".)

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Homebrew/formula.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 10e345e701..c102af3fe7 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -353,7 +353,7 @@ private
     hash = fn.incremental_hash(hasher)
 
     if supplied and not supplied.empty?
-      raise "#{type} mismatch\nExpected: #{hash}\nArchive: #{fn}" unless supplied.upcase == hash.upcase
+      raise "#{type} mismatch\nExpected #{supplied}, got #{hash}\nArchive: #{fn}" unless supplied.upcase == hash.upcase
     else
       opoo "Cannot verify package integrity"
       puts "The formula did not provide a download checksum"