From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 8 Jul 2011 17:01:46 +0000 (-0400)
Subject: Delete accounts before domains.
X-Git-Tag: 0.0.1~122
X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=commitdiff_plain;h=24c272e3110c82f302b3a7a3d574fb0cbd438c8b;hp=cb6bcbecba8aa33c558a2d9217e284cbefe7513a

Delete accounts before domains.
---

diff --git a/bin/mailshears b/bin/mailshears
index 9d870d0..803da46 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -110,13 +110,8 @@ Plugin.includers.each do |plugin_class|
     end
 
     if Configuration::I_MEAN_BUSINESS
-      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
-
+      # 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.
@@ -124,6 +119,13 @@ Plugin.includers.each do |plugin_class|
         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} (#{domain_description})"
+      end
     end
 
     puts ""