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

pym/cl_client.py

@@ -799,7 +799,7 @@ install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
         self.printOK(_("Umount user %s resource") %userName + " ...")
         return True
 
-    def mountUserRes(self, userName):
+    def mountUserRes(self, userName, sync=True):
         """Монтирование пользовательских ресурсов и синхронизация настроек"""
         self.createClVars()
         # В случае компьютера вне домена
@@ -873,8 +873,9 @@ install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
         if flagError:
             return False
         # Синхронизируем настройки
-        if not self.syncUser(userName, homeDir, "login"):
-            return False
+        if sync:
+            if not self.syncUser(userName, homeDir, "login"):
+                return False
         self.printSUCCESS(_("Mount user resource in domain"))
         self.printOK(_("Get a user profile in the domain") + " ...")
         return True

scripts/cl-sync

@@ -52,18 +52,25 @@ if __name__ == "__main__":
                                      cl_client.cl_client,object),
                                     {})
                     ldapObj = newClass("cl-sync")
-            if optObj.opt.has_key('login'):
+            if optObj.opt.has_key('login') and optObj.opt.has_key('nosync'):
                 userName = optObj.params['user']
-                if not ldapObj.mountUserRes(userName):
+                if not ldapObj.mountUserRes(userName,False):
                     flagError = True
-            elif optObj.opt.has_key('logout'):
+            elif optObj.opt.has_key('login'):
                 userName = optObj.params['user']
-                if not ldapObj.umountUserRes(userName):
+                if not ldapObj.mountUserRes(userName):
                     flagError = True
-            elif optObj.opt.has_key('nosync'):
+            elif optObj.opt.has_key('logout') and optObj.opt.has_key('nosync'):
                 userName = optObj.params['user']
                 if not ldapObj.umountUserResNoSync(userName):
                     flagError = True
+            elif optObj.opt.has_key('logout'):
+                userName = optObj.params['user']
+                if not ldapObj.umountUserRes(userName):
+                    flagError = True
+            else:
+                optObj.handlerErrOpt()
+                sys.exit(1)
         if optObj.opt.has_key('color'):
             if len(optObj.opt) == 1:
                 optObj.handlerErrOpt()