Update the RoundcubeDb plugin for v0.7.

[mailshears.git] / bin / mailshears

diff --git a/bin/mailshears b/bin/mailshears
index 9f913621667c686e49504e1b6f465458410c2ca8..803da46f417941f6d289ee2fdc4f9894e7211651 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -110,14 +110,21 @@ Plugin.includers.each do |plugin_class|
     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|
+        # 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} (#{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