Change using linux ver from content of iso.

pym/cl_distr.py

@@ -127,38 +127,43 @@ class DistributiveRepository:
         else:
             return {}
 
+    def _getfromcontent(self,filename):
+        """Get info from content"""
+        varsShare = self.varsShare
+        distr = None
+        # may be directory is isodir (directory which contains iso image)
+        extname = "isodir"
+        try:
+            distr = IsoDistributive(filename)
+            filename = distr.convertToDirectory().directory
+        except Exception,e:
+            extname = "dir"
+        d = self.ini_to_dict(path.join(filename,
+            'etc/calculate/calculate.ini'))
+        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 \
+                    varsShare.getShortnameByIni(filename) or \
+                    varsShare.detectOtherShortname(filename) or \
+                    "Linux"
+        d['ver'] = \
+            varsShare.getVersionFromMetapackage(filename,d["name"]) or \
+            varsShare.getVersionFromCalculateIni(filename) or "0"
+        if distr:
+            distr.close()
+        return d
+
     def _getdistrinfo(self,filename):
         """Get information by distributive"""
         varsShare = self.varsShare
         # if filename is directory
         if path.isdir(filename):
-            distr = None
+            return self._getfromcontent(filename)
-            # may be directory is isodir (directory which contains iso image)
-            extname = "isodir"
-            try:
-                distr = IsoDistributive(filename)
-                filename = distr.convertToDirectory().directory
-            except Exception,e:
-                extname = "dir"
-            d = self.ini_to_dict(path.join(filename,
-                'etc/calculate/calculate.ini'))
-            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 \
-                        varsShare.getShortnameByIni(filename) or \
-                        varsShare.detectOtherShortname(filename) or \
-                        "Linux"
-            d['ver'] = \
-                varsShare.getVersionFromMetapackage(filename,d["name"]) or \
-                varsShare.getVersionFromCalculateIni(filename) or "0"
-            if distr:
-                distr.close()
-            return d
         else:
             match = self.reDistName.match(filename)
             if not match:

pym/cl_fill_install.py

@@ -587,7 +587,8 @@ class fillVars(object, glob_attr):
                              self.Get('cl_image_path'),
                              self.Get('os_install_arch_machine'),
                              self.Get('os_install_linux_shortname'),
-                             self.Get('os_install_linux_ver'))
+                             None)
+                             #self.Get('os_install_linux_ver'))
 
     def get_os_install_linux_shortname(self):
         """Shortname of installation os"""
@@ -607,19 +608,20 @@ class fillVars(object, glob_attr):
                                   self.Get('cl_image_path'),
                                   self.Get('os_install_arch_machine'),
                                   self.Get('os_install_linux_shortname'))
-        res = DistributiveRepository.reDistName.search(imagename)
+        if not imagename:
-        if res:
+            return ""
-            return res.groupdict()['ver']
+        d = DistributiveRepository()._getfromcontent(imagename)
-        elif path.isdir(imagename):
+        if "linuxver" in d:
-            d = DistributiveRepository()._getdistrinfo(imagename)
+            return d['linuxver']
-            if "linuxver" in d:
+        elif "ver" in d:
-                return d['linuxver']
+            return d['ver']
-            if "ver" in d:
-                return d['ver']
         else:
             if self.Get('os_install_linux_shortname') == \
                 self.Get('os_linux_shortname'):
                 return self.Get('os_linux_ver')
+        res = DistributiveRepository.reDistName.search(imagename)
+        if res:
+            return res.groupdict()['ver']
         return ""
 
     def get_cl_pkgdir_path(self):

pym/cl_share_cmd.py

@@ -19,6 +19,7 @@ import os
 
 from cl_print import color_print
 from cl_utils import _error
+import cl_install
 
 # Перевод сообщений для программы
 from cl_lang import lang
@@ -57,6 +58,8 @@ class share_cmd(color_print, _error):
                 v = int(optObj.v)
             except:
                 v = 1
+            cl_overriding.exit = cl_install.defaultExit
+            cl_overriding.printERROR = cl_install.defaultPrintERROR
             self.logicObj.clVars.printVars(varsFilter, varsNames, 
                                            outFormat=format,
                                            verbose=v)

pym/cl_vars_install.py

@@ -155,7 +155,7 @@ class Data:
     os_install_linguas = {'mode':'w'}
 
     # linux version of installation os
-    os_install_linux_ver = {'mode':'w'}
+    os_install_linux_ver = {'mode':'r'}
 
     # subname of installation os
     os_install_linux_subname = {'mode':'w'}