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

Mike Khiretskiy 9 years ago
parent d4b21f22c4
commit 31aaefb34d

@ -167,7 +167,10 @@ class Builder(Update):
root: каталог, куда будут наложны шаблоны (cl_root_path) root: каталог, куда будут наложны шаблоны (cl_root_path)
""" """
from calculate.lib.cl_template import (TemplatesError, from calculate.lib.cl_template import (TemplatesError,
ProgressTemplate) ProgressTemplate,
templateFunction)
templateFunction.installProg = {}
templateFunction.installCategory = []
if target is None: if target is None:
chroot = '/' chroot = '/'
elif isinstance(target, Distributive): elif isinstance(target, Distributive):
@ -197,6 +200,8 @@ class Builder(Update):
for copyvar in ("cl_dispatch_conf", "cl_verbose_set", for copyvar in ("cl_dispatch_conf", "cl_verbose_set",
"update.cl_update_world"): "update.cl_update_world"):
clVars.Set(copyvar, self.clVars.Get(copyvar), force=True) clVars.Set(copyvar, self.clVars.Get(copyvar), force=True)
clVars.iniCache = {}
clVars.flIniFile() clVars.flIniFile()
cltFilter=True if cltFilter in (True,"on") else False cltFilter=True if cltFilter in (True,"on") else False
clVars.Set("cl_chroot_path", chroot, True) clVars.Set("cl_chroot_path", chroot, True)
@ -207,6 +212,7 @@ class Builder(Update):
self.addProgress() self.addProgress()
nullProgress = lambda *args,**kw:None nullProgress = lambda *args,**kw:None
dispatch = self.dispatchConf if useDispatch else None dispatch = self.dispatchConf if useDispatch else None
clTempl = ProgressTemplate(nullProgress,clVars, clTempl = ProgressTemplate(nullProgress,clVars,
cltObj=useClt, cltObj=useClt,
cltFilter=cltFilter, cltFilter=cltFilter,

Loading…
Cancel
Save