Merge remote-tracking branch 'refs/remotes/kali/feature/import-maildir' into develop

1 files changed, 7 insertions, 3 deletions

diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py
index e8423fd5..d8d1d38a 100644
--- a/src/leap/bitmask/app.py
+++ b/src/leap/bitmask/app.py
@@ -54,7 +54,7 @@ from leap.bitmask.util import log_silencer
 from leap.bitmask.util.leap_log_handler import LeapLogHandler
 from leap.bitmask.util.streamtologger import StreamToLogger
 from leap.bitmask.platform_init import IS_WIN
-from leap.bitmask.services.mail.repair import repair_account
+from leap.bitmask.services.mail import plumber
 from leap.common.events import server as event_server
 from leap.mail import __version__ as MAIL_VERSION
 
@@ -176,9 +176,13 @@ def main():
         print "leap.mail version: %s" % (MAIL_VERSION,)
         sys.exit(0)
 
-    if opts.acct_to_repair:
-        repair_account(opts.acct_to_repair)
+    if opts.repair:
+        plumber.repair_account(opts.acct)
         sys.exit(0)
+    if opts.import_maildir and opts.acct:
+        plumber.import_maildir(opts.acct, opts.import_maildir)
+        sys.exit(0)
+    # XXX catch when import is used w/o acct
 
     standalone = opts.standalone
     offline = opts.offline