Change vars display

master3.3
Mike Hiretsky 15 years ago
parent ccce7d8f45
commit 0842ebf730

@ -603,10 +603,10 @@ class cl_install(color_print):
self.clVars.Get('os_arch_machine'))
self.printSUCCESS(_("Quantity processors")+": %s"%
self.clVars.Get('hr_cpu_num'))
self.printSUCCESS(_("Videocard")+": %s"%
'<needed>')
self.printSUCCESS(_("Videocard vendor")+": %s"%
self.clVars.Get('hr_video'))
self.printSUCCESS(_("Screen resolution")+": %s"%
'<needed>')
self.clVars.Get('hr_x11_standart'))
self.defaultPrint("%s\n"%_("Localization"))
self.printSUCCESS(_("Language")+": %s"%
self.clVars.Get('os_locale_lang'))

@ -126,7 +126,7 @@ class install_cmd(cl_install,share_cmd):
else:
if values.d == None:
values.d = self.detectPreviousSystem()
if values.vars is None and \
if values.v is None and \
values.d is None:
self.optobj.error(_("need specify disk by '-d' option"))
# check syntax DISK:DIR:FS:'Do I need to format the disk'
@ -226,13 +226,7 @@ class install_cmd(cl_install,share_cmd):
def displayVars(self,vars):
"""Process displaying variables"""
terms = vars.split(",")
# if value of vars is "all" print all variables
if terms == ["all"]:
self.clVars.printVars()
# print only specified variables
else:
self.clVars.printVars(terms)
self.clVars.printVars()
def _parseOptSwap(self, listOpt):
"""Parse value cmd option --swap"""

@ -27,9 +27,8 @@ class share_cmd(color_print, _error):
"""Класс общих методов обработки опций командной строки"""
def printVars(self, optObj):
"""Печать переменных"""
if optObj.vars:
terms = optObj.vars.split(",")
self.printVars(terms)
if optObj.v:
self.printVars()
def setVars(self, optObj):
"""Установка переменных"""

@ -49,8 +49,8 @@ if __name__ == "__main__":
if not install.checkAndSetInstallOptions(options.d,options.w,options.b):
sys.exit(1)
# print variables
if options.vars:
install.displayVars(options.vars)
if options.v:
install.displayVars(options.v)
sys.exit(0)
# apply template to current system
#elif options.T:

Loading…
Cancel
Save