Изменена сортировка LiveHDD, изменено сообщение при eix-update

pym/builder/utils/cl_builder_profile.py

@@ -89,7 +89,7 @@ class ClBuilderProfileAction(Action):
               },
              {'name': 'eix_update',
               'message': __("Updating the eix cache for "
-                            "{cl_builder_repository_name}"),
+                            "{cl_builder_eix_repositories}"),
               'method': 'Builder.eixUpdate(cl_builder_repository_name)',
               },
              # save

pym/builder/utils/cl_builder_update.py

@@ -161,7 +161,7 @@ class ClBuilderUpdateAction(Action):
                       },
                      {'name': 'eix_update',
                       'message': __("Updating the eix cache for "
-                                    "{cl_builder_repository_name}"),
+                                    "{cl_builder_eix_repositories}"),
                       'method': 'Builder.eixUpdate(cl_builder_repository_name)',
                       'condition': (lambda Get: (
                           Get('builder.cl_builder_outdate_set') == 'on' and

pym/builder/variables/builder.py

@@ -1549,6 +1549,7 @@ class VariableClBuilderFlashDev(ReadonlyVariable):
                 return ""
         return ""
 
+
 class VariableClBuilderFlashPath(ReadonlyVariable):
     """
     Путь, куда подключена flash (загрузка либо с флешки, либо с iso)
@@ -1579,10 +1580,12 @@ class VariableClBuilderFlashUuid(ReadonlyVariable):
                     install_os_disk_dev=dev, limit=1)
         return ""
 
+
 class VariableClBuilderGrubRefreshSet(ReadonlyVariable):
     """
     Обновить меню grub (HDD c включенным LiveHDD или isoscan-grub
     """
+
     def get(self):
         root_type_ext = self.Get('os_root_type_ext')
         action = self.Get('cl_action')
@@ -1601,3 +1604,15 @@ class VariableClBuilderGrubRefreshSet(ReadonlyVariable):
                 if isoimage_dir == rep_dir:
                     return "on"
         return "off"
+
+
+class VariableClBuilderEixRepositories(ReadonlyVariable):
+    """
+    Отображаемый список обновляемых репозиториев eix
+    """
+
+    def get(self):
+        return ", ".join(
+            x for x in chain(
+                reversed(self.Get('update.cl_update_rep_name')),
+                self.Get('builder.cl_builder_other_rep_name')))

pym/builder/variables/images.py

@@ -18,6 +18,7 @@ import re
 import sys
 from calculate.lib.utils.common import getTupleVersion
 from calculate.lib.utils.portage import isPkgInstalled
+from calculate.lib.utils.tools import ReverseKey
 from calculate.lib.variables.linux import LinuxDataVars
 from calculate.install.distr import IsoDistributive, DistributiveError
 from calculate.lib.utils.files import listDirectory
@@ -139,14 +140,14 @@ class VariableClBuilderImageData(ReadonlyTableVariable):
             # build
             else:
                 return (0, m.group(3),
-                        -int(m.group(5)) if m.group(5) else 0, m.group(1),
-                        m.group(6))
+                        -int(m.group(5)) if m.group(5) else 0,
+                        ReverseKey(m.group(1)), m.group(6))
         else:
             m = self.ver_parser.search(x)
             if m:
-                return -1, getTupleVersion(m.group(2)), m.group(1)
+                return -1, getTupleVersion(m.group(2)), ReverseKey(m.group(1))
             else:
-                return -2, x,
+                return -2, ReverseKey(x),
 
     def generator(self, isopath):
         n = 1