|
|
@ -792,7 +792,7 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
#self.clVars.Set("cl_root_path","/", True)
|
|
|
|
#self.clVars.Set("cl_root_path","/", True)
|
|
|
|
self.clVars.Set("cl_chroot_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()
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
if self.clTempl.getError():
|
|
|
|
if self.clTempl.getError():
|
|
|
|
self.printERROR(self.clTempl.getError())
|
|
|
|
self.printERROR(self.clTempl.getError())
|
|
|
@ -951,7 +951,12 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
"""Apply templates for root of system."""
|
|
|
|
#self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
#self.clVars.Set("cl_root_path",directory, True)
|
|
|
|
self.clVars.Set("cl_chroot_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()
|
|
|
|
dirsFiles = self.clTempl.applyTemplates()
|
|
|
|
if self.clTempl.getError():
|
|
|
|
if self.clTempl.getError():
|
|
|
|
raise InstallError(self.clTempl.getError())
|
|
|
|
raise InstallError(self.clTempl.getError())
|
|
|
|