Множественные изменения

assemble.env -> builder.env
Исправлено скачивание видеодрайверов
Исправлен список исключения --keep-tree=off

pym/builder/build_storage.py

@@ -142,7 +142,7 @@ class BuildStorage(object):
     """
     Хранилище в котором находится информация о собираемом дистрибутиве
     """
-    ini_file = "/etc/calculate/assemble.env"
+    ini_file = "/etc/calculate/builder.env"
     data_dir = path.join(builder_data, "mount")
 
     def __init__(self, data_dir=None, ini_file=None):

pym/builder/utils/cl_builder_image.py

@@ -55,6 +55,9 @@ class ClBuilderImageAction(Action):
                    '"-afmR")',
          'condition': lambda Get: Get('cl_builder_prelink_set') == 'on'
          },
+        {'name': 'reconfigure_vars1',
+         'method': 'Builder.invalidateVariables("cl_builder_linux_datavars")',
+         },
         # получить видеодрайверы
         {'name': 'fetch_video_drivers',
          'group': __("Fetching video drivers"),

pym/builder/variables/builder.py

@@ -676,7 +676,6 @@ class VariableClBuilderPkgdir(Variable):
         else:
             return ""
 
-
 class VariableClBuilderAction(ReadonlyVariable):
     """
     Дополнительное действие по созданию образа: iso, squash.
@@ -1150,9 +1149,10 @@ class VariableClBuilderSquashExclude(ReadonlyVariable):
     def get(self):
         builder_path = self.Get('cl_builder_path')
         keep_tree = self.GetBool('cl_builder_keep_tree_set')
-        excludes = ["", "metadata", "profiles/templates/deprecated"]
+        excludes = ["", "metadata"]
         important = [".git", "distfiles", "packages", "eclass", "metadata",
                      "profiles", "layout.conf"]
+        exclude_dirs = ["profiles/templates/deprecated"]
 
         def generator():
             for rep_dn in self.Get('cl_builder_repository_location'):
@@ -1161,6 +1161,10 @@ class VariableClBuilderSquashExclude(ReadonlyVariable):
                     for exclude_name in (x for x in listDirectory(dn)
                                          if x not in important):
                         yield path.join(rep_dn, exclude_dn, exclude_name)[1:]
+                for exclude_dn in exclude_dirs:
+                    dn = pathJoin(builder_path, rep_dn, exclude_dn)
+                    if path.exists(dn):
+                        yield path.join(rep_dn, exclude_dn)
 
         if not keep_tree and builder_path:
             return list(generator())