diff --git a/pym/cl_builder.py b/pym/cl_builder.py index c05b1f5..ac2b774 100644 --- a/pym/cl_builder.py +++ b/pym/cl_builder.py @@ -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): diff --git a/pym/cl_fill_builder.py b/pym/cl_fill_builder.py index 3008787..34405f2 100644 --- a/pym/cl_fill_builder.py +++ b/pym/cl_fill_builder.py @@ -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 "" diff --git a/pym/cl_vars_builder.py b/pym/cl_vars_builder.py index b3b46b0..9bfa419 100644 --- a/pym/cl_vars_builder.py +++ b/pym/cl_vars_builder.py @@ -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 = {}