First pylint validation

[imap-restore-mail] / restore_mail_inject.py

diff --git a/restore_mail_inject.py b/restore_mail_inject.py
index 11b9471..9623ead 100644 (file)
--- a/restore_mail_inject.py
+++ b/restore_mail_inject.py
@@ -25,11 +25,14 @@ def main():
     # prepare configuration
     args = configure_args()
     warnings_handler = prepare_logger()
-    logging.info("The module restore_mail_inject.py started with user %s, folder %s and source %s." %
-          (args.user, args.folder, args.srcdir))
-
-    # connect
-    session = MailIterator(args.user)
+    logging.info("The module restore_mail_inject.py started with user %s, folder %s and source %s.",
+          args.user, args.folder, args.srcdir)
+
+    # connect to unix socket or server
+    if(args.unix_socket_disabled):
+        session = MailIterator(args.user)
+    else:
+        session = MailIterator(args.user)
     #session = MailIterator("/var/imap/socket/imap", "cyrus", "geheim")
     storage = FileIterator()
 
@@ -63,7 +66,7 @@ def main():
     for acl_mailbox in storage.acl_mailboxes:
         session.add_acls(acl_mailbox, mailbox_list, args.ouser, args.user)
 
-    logging.info("Finished injecting mails. Exiting with code %s." % warnings_handler.detected_problems)
+    logging.info("Finished injecting mails. Exiting with code %s.", warnings_handler.detected_problems)
     return warnings_handler.detected_problems
 
 def configure_args():
@@ -82,6 +85,8 @@ def configure_args():
                         default="", help='name of the original user (=username if not specified)')
     parser.add_argument('-a', '--append', dest='append', action='store_true',
                         default=False, help="append mails, don't delete anything")
+    parser.add_argument('-n', '--normal', dest='unix_socket_disabled', action='store_true',
+                        default=False, help='disable unix socket usage for the IMAP connection')
     args = parser.parse_args()
 
     if (args.folder != "INBOX"):