Delete accounts before domains.
authorMichael Orlitzky <michael@orlitzky.com>
Fri, 8 Jul 2011 17:01:46 +0000 (13:01 -0400)
committerMichael Orlitzky <michael@orlitzky.com>
Fri, 8 Jul 2011 17:01:46 +0000 (13:01 -0400)
bin/mailshears

index 9d870d04e245c4a6fef34c07b85ff9453694cd94..803da46f417941f6d289ee2fdc4f9894e7211651 100755 (executable)
@@ -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 ""