From 94c0972be0bddf20f3892449a2853f1a73d0b65f Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 24 Nov 2010 17:46:51 +0300 Subject: [PATCH] Fix clt appling to installed system. --- pym/cl_install.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/cl_install.py b/pym/cl_install.py index d395802..3c5516a 100644 --- a/pym/cl_install.py +++ b/pym/cl_install.py @@ -792,7 +792,7 @@ class cl_install(color_print, SignalInterrupt): """Apply templates for root of system.""" #self.clVars.Set("cl_root_path","/", True) self.clVars.Set("cl_chroot_path","/", True) - self.clTempl = template(self.clVars) + self.clTempl = template(self.clVars,cltFilter=False) dirsFiles = self.clTempl.applyTemplates() if self.clTempl.getError(): self.printERROR(self.clTempl.getError()) @@ -951,7 +951,12 @@ class cl_install(color_print, SignalInterrupt): """Apply templates for root of system.""" #self.clVars.Set("cl_root_path",directory, True) self.clVars.Set("cl_chroot_path",directory, True) - self.clTempl = template(self.clVars) + clTemplateCltPath = \ + filter(lambda x:path.exists(x), + map(lambda x:pathJoin(directory,x), + self.clVars.Get('cl_template_clt_path'))) + self.clVars.Set('cl_template_clt_path',clTemplateCltPath,True) + self.clTempl = template(self.clVars,cltFilter=False) dirsFiles = self.clTempl.applyTemplates() if self.clTempl.getError(): raise InstallError(self.clTempl.getError())