|
|
|
@ -19,11 +19,13 @@ import sys
|
|
|
|
|
|
|
|
|
|
from cl_install import cl_install, InstallError, __app__, __version__,\
|
|
|
|
|
get_install_errors
|
|
|
|
|
from cl_vars_share import varsShare
|
|
|
|
|
from cl_opt import opt
|
|
|
|
|
from cl_share_cmd import share_cmd
|
|
|
|
|
|
|
|
|
|
from cl_lang import lang
|
|
|
|
|
lang().setLanguage(sys.modules[__name__])
|
|
|
|
|
OSSYSTEM_LIST=sorted(varsShare.dictNameSystem.keys())
|
|
|
|
|
|
|
|
|
|
DESCRIPTION = _("The Calculate Linux installation and configuration utility")
|
|
|
|
|
CMD_OPTIONS = [{'shortOption':"d",
|
|
|
|
@ -65,7 +67,7 @@ CMD_OPTIONS = [{'shortOption':"d",
|
|
|
|
|
'longOption':"os",
|
|
|
|
|
'optVal':"SYSTEM",
|
|
|
|
|
'type':'choice',
|
|
|
|
|
'choices_regignore':['CLD','CDS','CLS','CSS','CLDG','CLDX'],
|
|
|
|
|
'choices_regignore': OSSYSTEM_LIST,
|
|
|
|
|
'help':_("select operation system")
|
|
|
|
|
},
|
|
|
|
|
{'longOption':"march",
|
|
|
|
@ -187,13 +189,6 @@ class install_cmd(share_cmd):
|
|
|
|
|
self.optobj.error(_("option %s:") %"d" +\
|
|
|
|
|
" " + _("disk specifing error: '%s'")\
|
|
|
|
|
%", ".join(wrongValue))
|
|
|
|
|
if values.s:
|
|
|
|
|
choices = ['cld','cds','cls','css','cldg','cldx']
|
|
|
|
|
if not values.s.lower() in choices:
|
|
|
|
|
choices = ", ".join(map(repr, choices))
|
|
|
|
|
self.optobj.error(_("option %s:")%"s"+ " " +\
|
|
|
|
|
_("invalid choice: %r")%values.s+ " " +\
|
|
|
|
|
_("(choose from %s)")%choices)
|
|
|
|
|
# check syntax SRC_DIR:DEST_DIR
|
|
|
|
|
if values.b:
|
|
|
|
|
reTrueBind = re.compile("^[^:]+:[^:]+$")
|
|
|
|
|