Add build variable and change printInfo.

netsetup
Mike Hiretsky 14 years ago
parent af7bb6d2a1
commit 04e19b15c3

@ -1124,3 +1124,18 @@ class fillVars(object, glob_attr):
if drvsForCardsid and drvsForCardsid[0][0] in masks:
return masks[drvsForCardsid[0][0]]
return ""
def get_os_install_linux_build(self):
"""Linux build"""
imagename = self.getImage(self.Get('os_install_scratch'),
self.Get('os_install_root_type'),
self.Get('cl_image_path'),
self.Get('os_install_arch_machine'),
self.Get('os_install_linux_shortname'))
if imagename:
res = DistributiveRepository.reDistName.search(imagename)
if res:
build = res.groupdict()['ver']
if re.match('^\d{8}$',build):
return build
return ""

@ -850,12 +850,16 @@ class cl_install(color_print, SignalInterrupt):
subname = self.clVars.Get('os_install_linux_subname')
subname = (" %s"%subname) if subname else ""
buildvar = self.clVars.Get('os_install_linux_build')
build = ""
if buildvar:
build = " (build %s)"%buildvar
if self.clVars.Get('cl_image'):
self.printSUCCESS(_("Found update")+": %s %s%s\n"%
self.printSUCCESS(_("Found update")+": %s %s%s%s\n"%
(self.clVars.Get('os_install_linux_name'),
self.clVars.Get('os_install_linux_ver'),
subname))
subname,build))
else:
self.printWARNING(_("No update available."))

@ -157,6 +157,9 @@ class Data:
# linux version of installation os
os_install_linux_ver = {'mode':'r'}
# linux build of installation os
os_install_linux_build = {'mode':'r'}
# subname of installation os
os_install_linux_subname = {'mode':'w'}

Loading…
Cancel
Save