TG-573

Правка автоопределения необходимости видеодрайверов

pym/builder/variables/builder.py

@@ -191,7 +191,7 @@ class VariableClBuilderVideodrvSet(IsoTypeHelper, Variable):
 
     def set(self, value):
         if value == 'auto' or value is None:
-            self.value = "on" if self.Get('main.os_linux_system') == "desktop" else "off"
+            self.value = "on" if self.Get('os_builder_linux_system') == "desktop" else "off"
         else:
             self.value = value
         return self.value

pym/builder/variables/linux.py

@@ -335,13 +335,10 @@ class VariableOsBuilderLinuxFullname(ReadonlyVariable):
     def get(self):
         name = self.Get('os_builder_linux_name')
         subname = self.Get('os_builder_linux_subname')
-        if subname:
-            subname = " %s" % subname
         ver = self.Get('os_builder_linux_ver')
         build = self.Get('os_builder_linux_build')
         arch = self.Get('os_builder_arch_machine')
-        return self.fullname_format.format(
-            name=name, ver=ver, subname=subname, arch=arch, build=build)
+        return ' '.join([x for x in [name, ver, subname, arch, build] if x])
 
 
 class VariableOsBuilderLinuxSubname(BuilderLinux):