From 825fde236576c7054c05fa257e0dc1cc44cde41c Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <michael@orlitzky.com>
Date: Mon, 16 Jul 2012 10:25:12 -0400
Subject: [PATCH] Add the domain/account name to NonexistentDomain/Account
 errors.

---
 lib/mailshears/plugins/dovecot_mailstore.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/mailshears/plugins/dovecot_mailstore.rb b/lib/mailshears/plugins/dovecot_mailstore.rb
index 44701bb..cf4711c 100644
--- a/lib/mailshears/plugins/dovecot_mailstore.rb
+++ b/lib/mailshears/plugins/dovecot_mailstore.rb
@@ -21,7 +21,7 @@ class DovecotMailstore < Mailstore
       domain_path = get_domain_path(domain)
       return domain_path
     rescue NonexistentDomainError => e
-      return "Doesn't Exist"
+      return "Doesn't exist: #{e.to_s}"
     end
   end
 
@@ -30,7 +30,7 @@ class DovecotMailstore < Mailstore
       account_path = get_account_path(account)
       return account_path
     rescue NonexistentAccountError => e
-      return "Doesn't Exist"
+      return "Doesn't exist: #{e.to_s}"
     end
   end
 
@@ -81,7 +81,7 @@ class DovecotMailstore < Mailstore
         usernames.each do |username|
           accounts << "#{username}@#{domain}"
         end
-      rescue NonexistentDomainError => e
+      rescue NonexistentDomainError
         # Party hard.
       end
     end
@@ -99,7 +99,7 @@ class DovecotMailstore < Mailstore
     if File.directory?(domain_path)
       return domain_path
     else
-      raise NonexistentDomainError
+      raise NonexistentDomainError.new(domain)
     end
   end
 
@@ -118,7 +118,7 @@ class DovecotMailstore < Mailstore
     begin
       domain_path = get_domain_path(domain_part)
     rescue NonexistentDomainError
-      raise NonexistentAccountError
+      raise NonexistentAccountError.new(account)
     end
 
     account_path = File.join(domain_path, user_part)
@@ -126,7 +126,7 @@ class DovecotMailstore < Mailstore
     if File.directory?(account_path)
       return account_path
     else
-      raise NonexistentAccountError
+      raise NonexistentAccountError(account)
     end
   end
 
-- 
2.43.2