Change using linux_ver.

master 2.2.1
Mike Hiretsky 14 years ago
parent f64bf3f355
commit aed2715d49

@ -629,10 +629,12 @@ class cl_builder(color_print):
'cl_assemble_path')).encode('utf-8'),True)
linuxver = _toUNICODE(envData.getVar(newprofile,
'os_assemble_linux_ver')).encode('utf-8')
if not linuxver:
if linuxver:
self.clVars.Set('os_builder_linux_ver',linuxver ,True)
else:
curdate = datetime.now()
linuxver = "%04d%02d%02d"%(curdate.year,curdate.month,curdate.day)
self.clVars.Set('os_builder_linux_ver',linuxver ,True)
self.clVars.Set('os_builder_linux_build',linuxver ,True)
return True
def createPackageList(self,chrootdir,filename):

@ -339,7 +339,8 @@ class fillVars(object, varsShare):
if paths:
return path.join(paths[0],"%(shortname)s-%(ver)s-%(march)s.iso"%
{'shortname':self.Get('os_builder_linux_shortname').lower(),
'ver':self.Get('os_builder_linux_ver'),
'ver':self.Get('os_builder_linux_build') or
self.Get('os_builder_linux_ver'),
'march':self.Get('os_builder_arch_machine')})
return ""

@ -109,6 +109,9 @@ class Data:
# build system ver
os_builder_linux_ver = {'mode':'r'}
# build system build
os_builder_linux_build = {'mode':'r','value':''}
# build system arch
os_builder_arch_machine = {}

Loading…
Cancel
Save