From 24c272e3110c82f302b3a7a3d574fb0cbd438c8b Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 8 Jul 2011 13:01:46 -0400 Subject: [PATCH] Delete accounts before domains. --- bin/mailshears | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 "" -- 2.44.2