Merge branch 'master' of git.calculate.ru:/calculate-lib

pym/update_config/cl_update_config.py

@@ -108,7 +108,6 @@ class DataVarsObject(cl_datavars.DataVars):
 
 class shareUpdateConfigs(color_print, writeLog):
     """Общие методы для обновления конфигурационных файлов"""
-    reCleanVer = re.compile("\d+\.?\d*\.?\d*")
     _tupleOn = ("on","On","oN","ON")
 
     def getFlagUpdAndInstPrograms(self):
@@ -157,9 +156,6 @@ class updateUserConfigs(shareUpdateConfigs):
             self.logger.info(_("Package %s") %nameProgram)
             self.logger.warn(_("Not found X sessions users"))
             return True
-        cleanVer = self.reCleanVer.search(version)
-        if cleanVer:
-            version = cleanVer.group()
         self.logger.info(_("Package %s") %nameProgram)
         self.logger.info(_("Update desktop configuration files"))
         if "calculate-desktop" in mergePrograms:
@@ -301,9 +297,6 @@ class updateSystemConfigs(shareUpdateConfigs):
             self.logger.info(_("Package %s") %nameProgram)
             self.logger.warn(_("Not found protected files"))
             return True
-        cleanVer = self.reCleanVer.search(version)
-        if cleanVer:
-            version = cleanVer.group()
         self.logger.info(_("Package %s") %nameProgram)
         self.logger.info(_("Update system cofiguration files"))
         if not os.path.exists(configPath):