From b5876f40142e8f1b19a24d897d52ae9fb4c98f65 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 12 Dec 2011 09:30:28 +0400 Subject: [PATCH] Add lang by default and timezone to print info. --- pym/cl_builder.py | 12 ++++++++++++ pym/cl_image_cmd.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pym/cl_builder.py b/pym/cl_builder.py index 356e0ba..0badefb 100644 --- a/pym/cl_builder.py +++ b/pym/cl_builder.py @@ -397,6 +397,12 @@ class cl_builder(color_print): self.clVars.Get('os_builder_linux_ver')) self.printSUCCESS(_("Machine hardware name")+": %s"% self.clVars.Get('os_builder_arch_machine')) + if self.clVars.Get('os_builder_locale_lang'): + self.printSUCCESS(_("Locale by default")+": %s"% + self.clVars.Get('os_builder_locale_lang')) + if self.clVars.Get('os_builder_clock_timezone'): + self.printSUCCESS(_("Timezone by default")+": %s"% + self.clVars.Get('os_builder_clock_timezone')) self.printSUCCESS(_("Free disk space for iso building: %s")% self.getFreeFor(path.dirname(path.normpath( self.clVars.Get('cl_builder_iso_path'))))) @@ -452,6 +458,12 @@ class cl_builder(color_print): self.clVars.Get('os_builder_linux_ver')) self.printSUCCESS(_("Machine hardware name")+": %s"% self.clVars.Get('os_builder_arch_machine')) + if self.clVars.Get('os_builder_locale_lang'): + self.printSUCCESS(_("Locale by default")+": %s"% + self.clVars.Get('os_builder_locale_lang')) + if self.clVars.Get('os_builder_clock_timezone'): + self.printSUCCESS(_("Timezone by default")+": %s"% + self.clVars.Get('os_builder_clock_timezone')) self.printSUCCESS(_("Free disk space on flash: %s")% self.getFreeFor(path.normpath( self.clVars.Get('cl_builder_iso_path')))) diff --git a/pym/cl_image_cmd.py b/pym/cl_image_cmd.py index 314a456..deef6c6 100644 --- a/pym/cl_image_cmd.py +++ b/pym/cl_image_cmd.py @@ -178,9 +178,9 @@ class image_cmd(share_cmd): if args and args[0] == "squash": self.logicObj.clVars.Set('cl_builder_iso_path','/mnt/flash',True) - if not self.logicObj.setTimezone(values.timezone): + if values.timezone and not self.logicObj.setTimezone(values.timezone): sys.exit(1) - if not self.logicObj.setLang(values.l): + if values.l and not self.logicObj.setLang(values.l): sys.exit(1) self.optobj.checkVarSyntax(values) return (values, args)