From b57d09fca4934252504b582eee30905c617eb1c3 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?= <mh@calculate.ru>
Date: Wed, 17 Mar 2021 11:21:57 +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=B0=20=D0=BF=D0=B5=D1=80=D0=B2=D0=B8=D1=87=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B4=D0=BE=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/client/client.py               | 8 +++++---
 pym/client/utils/cl_client_sync.py | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pym/client/client.py b/pym/client/client.py
index 0b8125d..b932bc7 100644
--- a/pym/client/client.py
+++ b/pym/client/client.py
@@ -1325,17 +1325,19 @@ class Client(commandServer, encrypt, Desktop):
         remoteProfile = "::profile/{}".format(profileName)
         if not self.syncUserNew(ps, uid, gid, homeDir, "login",
                                 remoteProfile, host=host):
-            if re.search(r'\[sender\] change_dir "{resPath}" \(in {resName}\) '
+            error_output = ps.output
+            if re.search(r'change_dir "\?{resPath}" \(in {resName}\) '
                 'failed: No such file or directory'.format(
                     resPath=profileName,
-                    resName="profile"), ps.output):
+                    resName="profile"), error_output) or \
+                    not ps.exists(remoteProfile):
                 if clearHomeDir:
                     # clean home directory
                     if not self.clearHomeDir(homeDir):
                         return False
                 return True
             else:
-                self.printERROR(ps.output)
+                self.printERROR(error_output)
                 self.printERROR(_("Failed to execute rsync"))
                 return False
         return True
diff --git a/pym/client/utils/cl_client_sync.py b/pym/client/utils/cl_client_sync.py
index 66e7ba4..c83b282 100644
--- a/pym/client/utils/cl_client_sync.py
+++ b/pym/client/utils/cl_client_sync.py
@@ -174,7 +174,7 @@ class ClClientSyncLoginAction(Action):
          'message': __("Mounting user resources"),
          'method': 'Client.mountUserDomainRes(ur_login,'
                    'desktop.ur_password,'
-                   'ur_uid,ur_gid,"share","homes","ftp")',
+                   'ur_uid,ur_gid,"homes","share","ftp")',
          },
         # монтируем профиль локального домена, если локальный профиль
         # старее удаленного доменного или актуальный профиль