From a2674d482eff48b64b52fcc20e17020b450ff7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 18 Mar 2021 10:04:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D1=81=D1=83=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BF=D1=80=D0=B8=20--sync=20off?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/client/utils/cl_client_sync.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pym/client/utils/cl_client_sync.py b/pym/client/utils/cl_client_sync.py index c83b282..bbdd3b0 100644 --- a/pym/client/utils/cl_client_sync.py +++ b/pym/client/utils/cl_client_sync.py @@ -44,7 +44,7 @@ class ClClientSyncLoginAction(Action): old_sync = [ # подключить удаленные ресурсы пользователя - {'name': 'domain_sync:mount_resources', + {'name': 'oldsync:mount_resources', 'message': __("Mounting user resources"), 'method': 'Client.mountUserDomainRes(ur_login,' 'desktop.ur_password,' @@ -170,7 +170,7 @@ class ClClientSyncLoginAction(Action): new_sync = [ # подключить удаленные ресурсы пользователя - {'name': 'domain_sync2:mount_resources2', + {'name': 'newsync:mount_resources2', 'message': __("Mounting user resources"), 'method': 'Client.mountUserDomainRes(ur_login,' 'desktop.ur_password,' @@ -279,20 +279,23 @@ class ClClientSyncLoginAction(Action): eq=dv.Get('ur_login'), limit=1) > 1) and dv.Get('cl_client_sync') == 'on') }, - {'name': 'domain_user:newsync', + {'name': 'domain_user:check_sync', 'method': 'Client.checkSync(cl_remote_host)', 'essential': False, - 'condition': lambda Get: Get('cl_client_sync') == 'on' }, - {'name': 'domain_user:domain_sync', + {'name': 'domain_user:oldsync', + 'depend': AllTasks.failed_one_of('check_sync') + }, + {'name': 'domain_user:newsync', + 'depend': AllTasks.success_one_of('check_sync') + }, + {'name': 'oldsync:domain_sync', 'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"process")', 'condition': lambda Get: Get('cl_client_sync') == 'on', - 'depend': AllTasks.failed_one_of('newsync') }, - {'name': 'domain_user:domain_sync2', + {'name': 'newsync:domain_sync2', 'method': 'Client.setSyncStatus(ur_home_path,ur_uid,ur_gid,"process")', 'condition': lambda Get: Get('cl_client_sync') == 'on', - 'depend': AllTasks.success_one_of('newsync') }, ] + old_sync + new_sync + [ # распаковать ссылки {'name': 'unpack_links',