From 8c025dbb31e2fbee8d1cde540ae7e3dd63c9f5cd 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: Fri, 4 Oct 2019 12:35:41 +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=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=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/desktop/variables/desktop.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pym/desktop/variables/desktop.py b/pym/desktop/variables/desktop.py index ca2f1d7..86f7a36 100644 --- a/pym/desktop/variables/desktop.py +++ b/pym/desktop/variables/desktop.py @@ -394,6 +394,15 @@ class VariableClDesktopUpdateProfileSet(Variable): """ type = "bool" + def is_fastlogin(self): + urLogin = self.Get('ur_login') + fastlogin = self.Get('cl_desktop_fastlogin_path') + fastlogin_user = path.join(fastlogin, urLogin) + if path.exists(fastlogin_user): + return True + return False + + def get(self): lastTimestamp = templateFunction.getLastElog() iniEnv = path.join(self.Get('ur_home_path'), '.calculate/ini.env') @@ -403,7 +412,9 @@ class VariableClDesktopUpdateProfileSet(Variable): userTimestamp = userTimestamp.encode('utf-8') profileSetup = userIni.getVar('main', 'profile_setup') login_setup = profileSetup == 'on' - if (self.Get('ur_domain_set') == 'on' or login_setup or + + if (self.Get('ur_domain_set') == 'on' or + not self.is_fastlogin() or login_setup or not path.exists(iniEnv) or userTimestamp != lastTimestamp): return 'on' else: