|
|
|
@ -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
|
|
|
|
|