From 51424b581211e1a7e1dd3d296e6dbe225531b2aa Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 23 Sep 2011 16:07:59 +0400 Subject: [PATCH] Fix detect current version if not has install images. --- pym/cl_fill_install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py index ed47357..e877401 100644 --- a/pym/cl_fill_install.py +++ b/pym/cl_fill_install.py @@ -838,6 +838,8 @@ class fillVars(object, glob_attr): def get_os_install_linux_ver(self): """Linux version of installation os""" + if self.Get('cl_action') != "system": + return self.Get('os_linux_ver') imagename = self.getImage(self.Get('os_install_scratch'), self.Get('os_install_root_type'), self.Get('cl_image_path'), @@ -845,8 +847,6 @@ class fillVars(object, glob_attr): self.Get('os_install_linux_shortname')) if not imagename and self.Get('cl_action') != 'merge': return "" - if self.Get('cl_action') != "system": - return self.Get('os_linux_ver') d = DistributiveRepository()._getfromcontent(imagename) if "linuxver" in d and d['linuxver'] != "0": return d['linuxver']