diff --git a/pym/cl_distr.py b/pym/cl_distr.py index c173ae5..32e9440 100644 --- a/pym/cl_distr.py +++ b/pym/cl_distr.py @@ -142,10 +142,11 @@ class DistributiveRepository: extname = "dir" d = self.ini_to_dict(path.join(filename, 'etc/calculate/calculate.ini')) - if d and path.exists(path.join(filename,'lib64')): - d['march'] = 'x86_64' - else: - d['march']= 'i686' + if not d or not "march" in d: + if path.exists(path.join(filename,'lib64')): + d['march'] = 'x86_64' + else: + d['march']= 'i686' if d: d['ext'] = extname d["name"] = varsShare.getShortnameByMakeprofile(filename) or \ diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py index 4409126..fa879ac 100644 --- a/pym/cl_fill_install.py +++ b/pym/cl_fill_install.py @@ -567,6 +567,8 @@ class fillVars(object, glob_attr): d = DistributiveRepository()._getdistrinfo(imagename) if "linuxver" in d: return d['linuxver'] + if "ver" in d: + return d['ver'] else: if self.Get('os_install_linux_shortname') == \ self.Get('os_linux_shortname'): diff --git a/pym/cl_install.py b/pym/cl_install.py index 2b8b3ef..79995ee 100644 --- a/pym/cl_install.py +++ b/pym/cl_install.py @@ -764,10 +764,6 @@ class otherfilesCopy(scanDirectory): {'src':pathname,'dst':pathJoin(self.target,pathname)}) return True - - - - class cl_install(color_print, SignalInterrupt): """Primary class for templates appling and system installation"""