From 31aaefb34d99a556d92cbf233ae828444006f3db Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Fri, 4 Sep 2015 18:01:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=BB=D0=BE=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/builder/builder.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pym/builder/builder.py b/pym/builder/builder.py index 23936e2..6a5a82a 100644 --- a/pym/builder/builder.py +++ b/pym/builder/builder.py @@ -167,7 +167,10 @@ class Builder(Update): root: каталог, куда будут наложны шаблоны (cl_root_path) """ from calculate.lib.cl_template import (TemplatesError, - ProgressTemplate) + ProgressTemplate, + templateFunction) + templateFunction.installProg = {} + templateFunction.installCategory = [] if target is None: chroot = '/' elif isinstance(target, Distributive): @@ -197,6 +200,8 @@ class Builder(Update): for copyvar in ("cl_dispatch_conf", "cl_verbose_set", "update.cl_update_world"): clVars.Set(copyvar, self.clVars.Get(copyvar), force=True) + + clVars.iniCache = {} clVars.flIniFile() cltFilter=True if cltFilter in (True,"on") else False clVars.Set("cl_chroot_path", chroot, True) @@ -207,6 +212,7 @@ class Builder(Update): self.addProgress() nullProgress = lambda *args,**kw:None dispatch = self.dispatchConf if useDispatch else None + clTempl = ProgressTemplate(nullProgress,clVars, cltObj=useClt, cltFilter=cltFilter,