Help restructuring.

pym/cl_install_cmd.py

@@ -42,27 +42,23 @@ CMD_OPTIONS = [{'shortOption':"d",
                 'action':'append',
                 'help':_("bind mount point for instalation")
                },
-               {'longOption':"mbr",
-                'optVal':"DEVICE",
-                'help':_("boot disk for the installed system \
-(to be recorded MBR), off - disable MBR writing")
-               },
                {'shortOption':"w",
                 'longOption':"swap",
                 'optVal':"SWAP_DISK",
                 'action':'append',
                 'help':_("swap disk for installation")
                },
+               {'longOption':"mbr",
+                'optVal':"DEVICE",
+                'help':_("boot disk for the installed system \
+(to be recorded MBR), off - disable MBR writing")
+               },
                {'longOption':"type",
                 'optVal':"DISKTYPE",
                 'type':'choice',
                 'choices':['flash','hdd','usb-hdd'],
                 'help':_("device type for installed system")
                },
-               {'shortOption':"f",
-                'longOption':"force",
-                'help':_("no questions during the install process")
-               },
                {'shortOption':"s",
                 'longOption':"os",
                 'optVal':"SYSTEM",
@@ -76,6 +72,9 @@ CMD_OPTIONS = [{'shortOption':"d",
                 'choices':['i686','x86_64'],
                 'help':_("select processor architecture")
                },
+               {'longOption':"build",
+                'help':_("installation for assembling")
+               },
                {'shortOption':"l",
                 'longOption':"lang",
                 'optVal':"LANG",
@@ -87,9 +86,6 @@ CMD_OPTIONS = [{'shortOption':"d",
                 'action':'append',
                 'help':_("add user to installed system")
                },
-               {'longOption':"live",
-                'help':_("configure current system")
-               },
                {'longOption':"proxy",
                 'optVal':"PROXY",
                 'help':_("set proxy server for system")
@@ -98,33 +94,42 @@ CMD_OPTIONS = [{'shortOption':"d",
                 'optVal':"NTP",
                 'help':_("set ntp server for system")
                },
-               {'shortOption':"P",
-                'help':_("use passwords for the users accounts \
-(from standard input)")
+               {'longOption':"nouuid",
+                'help':_("do not use UUID")
+               },
+               {'longOption':'set'},
+               {'shortOption':"f",
+                'longOption':"force",
+                'help':_("no questions during the install process")
+               },
+               {'longOption':"live",
+                'help':_("configure current system")
                },
                {'longOption':"install",
-                'help':_("configure the system to install this package")
+                'help':_("install package")
                },
                {'longOption':"uninstall",
-                'help':_("configure the system to uninstall this package")
-               },
-               {'longOption':"build",
-                'help':_("installation for assembling")
+                'help':_("uninstall package")
                },
                {'longOption':"nospinner",
                 'help':_("disable spinner")
                },
-               {'longOption':"no-uuid",
-                'help':_("do not use UUID")
+               {'shortOption':"P",
+                'help':_("use passwords for the users accounts \
+(from standard input)")
                }]
 
 class install_cmd(share_cmd):
     """Class for work with cl_install by console"""
     def __init__(self):
+        setpos = \
+            filter(lambda x:x[1].get('longOption')=="set",
+            enumerate(CMD_OPTIONS))[0][0]
+        CMD_OPTIONS[setpos] = opt.variable_set[0]
         self.optobj = opt(package=__app__,
                           version=__version__,
                           description=DESCRIPTION,
-                          option_list= CMD_OPTIONS + opt.variable_control +
+                          option_list= CMD_OPTIONS + opt.variable_view +
                           opt.color_control,
                           check_values=self.checkOpts)
         self.logicObj = cl_install()
@@ -270,7 +275,7 @@ class install_cmd(share_cmd):
         if self.optobj.values.march:
             self.logicObj.clVars.Set('os_install_arch_machine',
                                       self.optobj.values.march,True)
-        if self.optobj.values.no_uuid:
+        if self.optobj.values.nouuid:
             self.logicObj.clVars.Set('cl_uuid_set','off',True)
         if self.optobj.values.build:
             self.logicObj.clVars.Set('os_install_scratch',"on",True)