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

scripts/cl-client

@@ -39,7 +39,13 @@ if __name__ == "__main__":
         else:
             clVars.printVars(terms)
     elif not optObj.flagHelp:
-        if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
+        if optObj.opt.has_key('color'):
+            if not (optObj.opt["color"]=="never" or\
+                optObj.opt["color"]=="auto" or\
+                optObj.opt["color"]=="always"):
+                self.helpObj.getHelp(self.helpObj.relOptions['h'])
+                sys.exit(1)
+            if optObj.opt["color"]=="never":
                 newClass = type("cl_client_nocolor",(cl_client.printNoColor,
                                                 cl_client.cl_client,object),
                                 {})

scripts/cl-createhome

@@ -39,12 +39,18 @@ if __name__ == "__main__":
         else:
             clVars.printVars(terms)
     elif not optObj.flagHelp and optObj.params.has_key('user'):
-        userName = optObj.params['user'].strip()
-        if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
-            newClass = type("cl_client_nocolor",(cl_client.printNoColor,
+        if optObj.opt.has_key('color'):
+            if not (optObj.opt["color"]=="never" or\
+                optObj.opt["color"]=="auto" or\
+                optObj.opt["color"]=="always"):
+                self.helpObj.getHelp(self.helpObj.relOptions['h'])
+                sys.exit(1)
+            if optObj.opt["color"]=="never":
+                newClass = type("cl_client_nocolor",(cl_client.printNoColor,
                                                 cl_client.cl_client,object),
-                            {})
-            ldapObj = newClass("cl-createhome")
+                                {})
+                ldapObj = newClass("cl-createhome")
+        userName = optObj.params['user'].strip()
         if not ldapObj.createHome(userName):
             flagError = True
     if flagError:

scripts/cl-sync

@@ -40,11 +40,18 @@ if __name__ == "__main__":
             clVars.printVars(terms)
     elif not optObj.flagHelp:
         if optObj.params.has_key('user') and optObj.opt:
-            if optObj.opt.has_key('color') and optObj.opt["color"]=="never":
-                newClass = type("cl_client_nocolor",(cl_client.printNoColor,
-                                                cl_client.cl_client,object),
-                                {})
-                ldapObj = newClass("cl-sync")
+            if optObj.opt.has_key('color'):
+                if not (optObj.opt["color"]=="never" or\
+                    optObj.opt["color"]=="auto" or\
+                    optObj.opt["color"]=="always"):
+                    self.helpObj.getHelp(self.helpObj.relOptions['h'])
+                    sys.exit(1)
+                if optObj.opt["color"]=="never":
+                    newClass = type("cl_client_nocolor",
+                                    (cl_client.printNoColor,
+                                     cl_client.cl_client,object),
+                                    {})
+                    ldapObj = newClass("cl-sync")
             if optObj.opt.has_key('login'):
                 userName = optObj.params['user']
                 if not ldapObj.mountUserRes(userName):