Delete accounts before domains.

[mailshears.git] / bin / mailshears

diff --git a/bin/mailshears b/bin/mailshears
index abf46cc9c188da4be8f0326345588d2fddb186da..803da46f417941f6d289ee2fdc4f9894e7211651 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -97,7 +97,7 @@ Plugin.includers.each do |plugin_class|
       header += current_time.to_s + "\n"
     end
 
       header += current_time.to_s + "\n"
     end
 

-    header += 'Plugin: ' + plugin_name + "\n"
+    header += 'Plugin: ' + plugin_class.to_s + "\n"

     puts header
     puts '-' * header.size # Underline the header.
 
     puts header
     puts '-' * header.size # Underline the header.
 


@@ -110,14 +110,21 @@ Plugin.includers.each do |plugin_class|
     end
 
     if Configuration::I_MEAN_BUSINESS
     end
 
     if Configuration::I_MEAN_BUSINESS

-      leftover_domains.each do |domain|
-        plugin.delete_domain(domain)
-        puts "Removed: #{domain} (#{plugin.describe_domain(domain)})"
-      end
-
+      # We have to delete the accounts before the domain,
+      # otherwise they'd already be gone.

       leftover_accounts.each do |account|
       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)
         plugin.delete_account(account)

-        puts "Removed: #{account} (#{plugin.describe_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} (#{domain_description})"

       end
     end
 
       end
     end