From de35aaaa4b8a279709f61db10173451349c01e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Fri, 2 Apr 2010 17:12:17 +0400 Subject: [PATCH] Bugfix --- pym/cl_client.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/cl_client.py b/pym/cl_client.py index 186be8e..4fd499f 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -1918,9 +1918,9 @@ or ld_bind_dn or ld_bind_pw") pathProfileCurr = dictRes["profile"]["path"] osLinuxShort = self.clVars.Get("os_linux_shortname") # Находим директорию профиля - homeProfile = os.path.join(path, osLinuxShort) + homeProfile = os.path.join(pathProfileCurr, osLinuxShort) if not os.path.exists(homeProfile): - homeProfile = os.path.join(path, "." + osLinuxShort) + homeProfile = os.path.join(pathProfileCurr, "." + osLinuxShort) if os.path.exists(homeProfile): configFileName = os.path.join(homeProfile, self.pathConfig, self.configFileDesktop) @@ -2576,10 +2576,10 @@ or ld_bind_dn or ld_bind_pw") # Если не удалось использовать инкрементальный архив elif flagIncrArch is False: # Синхронизируем удаленный профиль - homeProfile = os.path.join(dictRes["remote_profile"]["path"], - osLinuxShort) + pathProfile = dictRes["remote_profile"]["path"] + homeProfile = os.path.join(pathProfile, osLinuxShort) if not self.upgradeProfileClient(userName, homeDir, - homeProfile): + pathProfile): # Отмонтируем пользовательские ресурсы в случае ошибки self.errorAndUnmountUserRes = True