Delete accounts before domains.

[mailshears.git] / bin / mailshears

diff --git a/bin/mailshears b/bin/mailshears
index 5a156f9dce691be8f5e8d0b2e676bec840f2c7a2..803da46f417941f6d289ee2fdc4f9894e7211651 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -110,20 +110,21 @@ Plugin.includers.each do |plugin_class|
     end
 
     if Configuration::I_MEAN_BUSINESS
+      # We have to delete the accounts before the domain,
+      # otherwise they'd already be gone.
+      leftover_accounts.each do |account|
+        # Get the description before we delete the domain.
+        # This can still fail if the account's domain is gone.
+        account_description = plugin.describe_account(account)
+        plugin.delete_account(account)
+        puts "Removed: #{account} (#{account_description})"
+      end
+      
       leftover_domains.each do |domain|
+        # Get the description before we delete the domain.
+        domain_description = plugin.describe_domain(domain)
         plugin.delete_domain(domain)
-        puts "Removed: #{domain} (#{plugin.describe_domain(domain)})"
-      end
-
-      leftover_accounts.each do |account|
-        begin
-          plugin.delete_account(account)
-          puts "Removed: #{account} (#{plugin.describe_account(account)})"
-        rescue NonexistentAccountError => e
-          # This usually happens after an account's domain is deleted.
-          # When we try to delete the account, it's already gone.
-          puts "Gone: #{account} (#{plugin.describe_account(account)})"
-        end
+        puts "Removed: #{domain} (#{domain_description})"
       end
     end