Изменены опции помощи выводимые скриптом cl-info

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

pym/cl_ldap.py

@@ -8199,62 +8199,66 @@ the password will be changed only for Samba account")
         {'progAccess':(14,),
          'shortOption':"m",
          'longOption':"machines",
-         'helpChapter':_("Common options"),
-         'help':_("information about machines")
+         'helpChapter':_("Samba service options"),
+         'help':_("information about all machines")
         },
         {'progAccess':(14,),
          'shortOption':"M",
          'optVal':"MACHINE",
-         'helpChapter':_("Common options"),
-         'help':_("information about machine")
+         'helpChapter':_("Samba service options"),
+         'help':_("information about the machine")
         },
         {'progAccess':(14,),
          'shortOption':"u",
          'longOption':"users",
          'helpChapter':_("Common options"),
-         'help':_("information about users")
+         'help':_("information about all users")
         },
         {'progAccess':(14,),
          'shortOption':"U",
          'optVal':"LOGIN",
          'helpChapter':_("Common options"),
-         'help':_("information about user")
+         'help':_("information about the user")
         },
         {'progAccess':(14,),
          'shortOption':"g",
          'longOption':"groups",
-         'helpChapter':_("Common options"),
-         'help':_("information about groups")
+         'helpChapter':_("Unix service options"),
+         'help':_("information about all groups")
         },
          {'progAccess':(14,),
          'shortOption':"G",
          'optVal':"GROUP",
-         'helpChapter':_("Common options"),
-         'help':_("information about group")
+         'helpChapter':_("Unix service options"),
+         'help':_("information about the group")
         },
         {'progAccess':(14,),
-         'longOption':"full",
-         'helpChapter':_("Unix service options"),
-         'help':_("full information (аll fields)")
+         'shortOption':"g",
+         'longOption':"groups",
+         'helpChapter':_("Mail service options"),
+         'help':_("information about all groups")
         },
          {'progAccess':(14,),
-         'longOption':"full",
-         'helpChapter':_("Samba service options"),
-         'help':_("full information (аll fields)")
-        },
-        {'progAccess':(14,),
-         'longOption':"full",
+         'shortOption':"G",
+         'optVal':"GROUP",
          'helpChapter':_("Mail service options"),
-         'help':_("full information (аll fields)")
+         'help':_("information about the group")
         },
         {'progAccess':(14,),
-         'longOption':"full",
+         'shortOption':"g",
+         'longOption':"groups",
          'helpChapter':_("Jabber service options"),
-         'help':_("full information (аll fields)")
+         'help':_("information about all groups")
+        },
+         {'progAccess':(14,),
+         'shortOption':"G",
+         'optVal':"GROUP",
+         'helpChapter':_("Jabber service options"),
+         'help':_("information about the group")
         },
         {'progAccess':(14,),
          'longOption':"full",
-         'helpChapter':_("FTP service options"),
+         'helpChapter':_("Common options"),
          'help':_("full information (аll fields)")
         },
         #{'progAccess':(0,1,2,4,5,6),
@@ -10587,14 +10591,13 @@ class cl_info(cl_utils2.cl_smartcon):
             return True
 
         if len(options) == 1 and options.has_key("full"):
-            if service == "unix" and options.has_key("full"):
-                self.printERROR(_("Can not use a single command line option \
+  
+            self.printERROR(_("Can not use a single command line option \
 'full'."))
-                self.printERROR(_("This option should be used in conjunction \
+            self.printERROR(_("This option should be used in conjunction \
 with another option."))
-                self.printWARNING(_("Example"))
-                self.printWARNING("  cl-info -u -full unix")
-                return False
+            self.printWARNING(_("Example"))
+            self.printWARNING("  cl-info -u -full %s" %service)
         return False
 
     def getQueryLDAP(self, service, branch, searchAttr, searchStr,