git-svn-id: http://svn.calculate.ru/calculate2/calculate-client/trunk@620 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_client.py

@@ -687,17 +687,24 @@ are not removed"))
         if not foudHostSamba:
             self.printERROR(_("Not found Samba server in %s")%domain)
             return False
+        userPwd = False
         if self.clVars.Get("cl_remote_host") and \
             self.clVars.Get("cl_remote_host") != domain:
             if not self.delDomain():
                 return False
+            # Создаем объект переменных (обновление переменных)
+            self.createClVars()
+            pwd = self.clVars.Get("cl_remote_pw")
+            if pwd:
+                userPwd = pwd
         foundMountRemote =self.isMount("/var/calculate/remote" ,"cifs")
         foundMountHome =self.isMount("/var/calculate/home" ,"none", False)
         if foundMountRemote:
                 self.printWARNING(_("Samba resource [remote] mount") + \
                                     " ...")
         else:
-            userPwd = self.getUserPassword("Domain password for the desktop")
+            if not userPwd:
+                userPwd=self.getUserPassword("Domain password for the desktop")
             pathRemote = "/var/calculate/remote"
             pwdRemote = userPwd
             if not os.path.exists(pathRemote):

scripts/cl-client

@@ -61,8 +61,6 @@ if __name__ == "__main__":
         elif optObj.opt.has_key('r') and optObj.opt.has_key('r'):
             if not ldapObj.delDomain(False):
                 flagError = True
-            if not ldapObj.delDomain():
-                flagError = True
         elif optObj.opt.has_key('r'):
             if not ldapObj.delDomain():
                 flagError = True