Исправлено наложение шаблонов в собираемой системе

Корректное использование cl_location_pass

pym/builder/builder.py

@@ -186,10 +186,12 @@ class Builder(Update):
         try:
             clVars.importData()
             if distro_dv:
-                clVars.Set('cl_template_path_use',
+                clVars.Set('cl_template_path',
                            [pathJoin(chroot, x)
                             for x in distro_dv.Get('cl_template_path')],
                            force=True)
+                clVars.Set('cl_template_path_use',
+                           clVars.Get('cl_template_path'), force=True)
             clVars.Set('cl_env_path',
                        [pathJoin(chroot, x) for x in clVars.Get('cl_env_path')],
                        force=True)

pym/builder/variables/builder.py

@@ -611,6 +611,7 @@ class VariableClBuilderId(ReadonlyVariable):
             return self.Get('cl_builder_prepared_id')
         elif action in Actions.BrokenAssemble:
             return self.Get('cl_builder_broken_id')
+        return ""
 
 
 class VariableOsBuilderMakeopts(Variable):