Исправлено использование EMERGE_DEFAULT_OPTS

pym/builder/builder.py

@@ -318,7 +318,7 @@ class Builder(Update):
         """
         Вывести информацию об обновлении
         """
-        deo = self.clVars.Get('cl_emerge_default_opts')
+        deo = self.get_default_emerge_opts()
         param = [x for x in params if x.startswith("-")]
         packages = [x for x in params if not x.startswith("-")]
         chroot_path = self.clVars.Get('cl_builder_path')
@@ -358,7 +358,7 @@ class Builder(Update):
         """
         Выполнить очистку системы от лишних пакетов
         """
-        deo = self.clVars.Get('cl_emerge_default_opts')
+        deo = self.get_default_emerge_opts()
         chroot_path = self.clVars.Get('cl_builder_path')
         logfile = self._get_log_file()
         with EmergeParser(self.chrootize(chroot_path, EmergeCommand(
@@ -895,11 +895,19 @@ class Builder(Update):
             process_func = partial(process_func, "/usr/bin/linux32")
         return partial(process_func, chroot_cmd)
 
+    def get_default_emerge_opts(self):
+        dv = self.clVars.Get('builder.cl_builder_linux_datavars')
+        if dv:
+            deo = dv.Get('cl_emerge_default_opts')
+        else:
+            deo = super(Builder, self).get_default_emerge_opts()
+        return deo
+
     def emerge(self, builder_path, use, *params):
         """
         Выполнить сборку пакета
         """
-        deo = self.clVars.Get('cl_emerge_default_opts')
+        deo = self.get_default_emerge_opts()
         extra_params = [x for x in params if x.startswith("-")]
         packages = [x for x in params if not x.startswith("-")]
         with EmergeParser(self.chrootize(builder_path, EmergeCommand(

pym/builder/variables/linux.py

@@ -68,6 +68,7 @@ class DataVarsBuilderLinux(linux.LinuxDataVars):
                     env.VariableClDistdir(),
                     env.VariableClEmergeConfig(systemRoot=self.systemRoot),
                     env.VariableClFeatures(),
+                    env.VariableClEmergeDefaultOpts(),
                     env.VariableClEnvLocation(),
                     env.VariableClEnvData(),
                     env.VariableClEnvPath(),