From 94fd15faa52a0b789ff1e705e5a8cdab4d279560 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Mon, 12 Oct 2015 10:18:09 +0200 Subject: Run initial soledad task for maintenance - Only disable it for repair tasks --- service/pixelated/maintenance.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'service/pixelated/maintenance.py') diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py index 41e749d7..f011658d 100644 --- a/service/pixelated/maintenance.py +++ b/service/pixelated/maintenance.py @@ -25,6 +25,9 @@ from pixelated.config import logger, arguments from leap.mail.constants import MessageFlags +REPAIR_COMMAND = 'repair' + + def initialize(): args = arguments.parse_maintenance_args() @@ -38,7 +41,7 @@ def initialize(): args.credentials_file, organization_mode=False, leap_home=args.leap_home, - initial_sync=False) + initial_sync=_do_initial_sync(args)) execute_command(args, leap_session) @@ -46,6 +49,14 @@ def initialize(): reactor.run() +def _do_initial_sync(args): + return not _is_repair_command(args) + + +def _is_repair_command(args): + return args.command == REPAIR_COMMAND + + def execute_command(args, leap_session): def init_soledad(): @@ -93,7 +104,7 @@ def add_command_callback(args, prepareDeferred, finalizeDeferred): elif args.command == 'sync': # nothing to do here, sync is already part of the chain prepareDeferred.chainDeferred(finalizeDeferred) - elif args.command == 'repair': + elif args.command == REPAIR_COMMAND: prepareDeferred.addCallback(repair) prepareDeferred.chainDeferred(finalizeDeferred) else: -- cgit v1.2.3