From: Plamen Dimitrov <plamen.dimitrov@intra2net.com>
Date: Wed, 11 Jul 2012 07:56:58 +0000 (+0200)
Subject: Main module rename and one additional warning in case acls for mailbox were not found
X-Git-Url: http://developer.intra2net.com/git/?p=imap-restore-mail;a=commitdiff_plain;h=12d5b37a22ef6eda5b1103cc6a9479ef4bea92e4

Main module rename and one additional warning in case acls for mailbox were not found
---

diff --git a/src/restore_mail_inject.py b/src/imap_restore_mail.py
similarity index 99%
rename from src/restore_mail_inject.py
rename to src/imap_restore_mail.py
index a22f758..e991398 100644
--- a/src/restore_mail_inject.py
+++ b/src/imap_restore_mail.py
@@ -20,6 +20,7 @@ from mail_iterator import MailIterator
 from file_iterator import FileIterator
 from warnings_handler import WarningsHandler
 
+# logging settings
 LOG_FILENAME = "restore_mail_inject.log"
 LOG_FILE_LEVEL = logging.DEBUG
 LOG_SHELL_LEVEL = logging.INFO
diff --git a/src/mail_iterator.py b/src/mail_iterator.py
index 74a9f81..e7c7f8f 100644
--- a/src/mail_iterator.py
+++ b/src/mail_iterator.py
@@ -114,8 +114,12 @@ class MailIterator:
             mbox_acls = mailbox_list[mailbox]
         except KeyError:
             # no rights for the mailbox were found
+            logging.warning("Could not find the acls for mailbox %s for user %s.", mailbox, original_user)
             return
         for acl_user in mbox_acls:
+            # (in case target user != original user):
+            # - don't overwrite acls eventually set for the current targetuser
+            # - don't set the default owner acls for the new folder
             if acl_user != target_user and acl_user != original_user:
                 try:
                     self.mail_con.setacl(mailbox, acl_user, mbox_acls[acl_user])
diff --git a/src/unit_tester.py b/src/unit_tester.py
index e30a0f6..ea9747a 100644
--- a/src/unit_tester.py
+++ b/src/unit_tester.py
@@ -62,7 +62,7 @@ class FileContentsParse(unittest.TestCase):
         parsed_acls = self.file_iter.load_mailbox_list(self.dummy_filename)
         self.assertIn("user.00schneider", parsed_acls)
         self.assertIn("00schneider", parsed_acls["user.00schneider"])
-        self.assertEqual(parsed_acls["user.00schneider"]["00schneider"], "lrswipkxtecda", "Wront acls were parsed for a user.")
+        self.assertEqual(parsed_acls["user.00schneider"]["00schneider"], "lrswipkxtecda", "Wrong acls were parsed for a user.")
 
     def test_mboxlist_totals(self):