From 4ebd8efa306f98d06d6e18c209019cb0ef0f1037 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Tue, 20 Jan 2015 11:40:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20os=5Fremote=5Fclient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/client/client.py | 5 ----- pym/client/variables/client.py | 5 ----- 2 files changed, 10 deletions(-) diff --git a/pym/client/client.py b/pym/client/client.py index 4387e5b..fdd7b1e 100644 --- a/pym/client/client.py +++ b/pym/client/client.py @@ -252,11 +252,9 @@ class Client(commandServer, encrypt, Desktop): self.clVars.Delete("cl_remote_host", "local") self.clVars.Delete("cl_remote_pw", "local") self.clVars.Delete("os_remote_auth") - self.clVars.Delete("os_remote_client") self.clVars.Set("cl_remote_host", "", True) self.clVars.Set("cl_remote_pw", "", True) self.clVars.Set("os_remote_auth", "", True) - self.clVars.Set("os_remote_client", "", True) return True def mountSambaRes(self,host,userName,userPwd,res,rpath,uid=None,gid=None): @@ -1083,7 +1081,6 @@ class Client(commandServer, encrypt, Desktop): # write domain to config self.clVars.Write("os_remote_auth", domain, True) # write current program version - self.clVars.Write("os_remote_client", currentVersion, True) self.clVars.Write("cl_remote_host", domain, True, "local") self.clVars.Write("cl_remote_pw", pwdRemote, True, "local") return True @@ -1126,13 +1123,11 @@ class Client(commandServer, encrypt, Desktop): self.printSUCCESS(_("The workstation is configured for work " "in the domain")) currentVersion = self.clVars.Get("cl_ver") - self.clVars.Write("os_remote_client", currentVersion, True) self.clVars.Write("os_remote_auth", hostAuth, True) else: self.printSUCCESS(_("The workstation is configured for work " "outside the domain")) self.clVars.Delete("os_remote_auth") - self.clVars.Delete("os_remote_client") return True def cDelLdapSysUsersAndSyncCache(self): diff --git a/pym/client/variables/client.py b/pym/client/variables/client.py index 21227b6..81223fe 100644 --- a/pym/client/variables/client.py +++ b/pym/client/variables/client.py @@ -299,11 +299,6 @@ class VariableClClientRelevanceSet(ReadonlyVariable): if (self.Get('cl_remote_host') and not isMount(self.Get('cl_client_remote_path'))): return "off" - currentVersion = self.Get("cl_ver") - # версия программы, который были наложены шаблоны - previousVersion = self.Get("os_remote_client") - if cmpVersion(currentVersion,previousVersion): - return "off" return "on" class VariableClClientRemotePath(Variable):