almalinux/lorax
12
0
Fork 0
Code Issues Pull Requests Releases Activity

treebuilder fixup: pass template vars to runner

Browse Source
This commit is contained in:
Will Woods 2011-05-12 16:54:09 -04:00
parent 9b5ccc764b
commit 7323749706
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pylorax/treebuilder.py
View File

@ -99,7 +99,7 @@ class BaseBuilder(object):
# parse and run the template # parse and run the template
t = LoraxTemplate(directories=[self.templatedir]) t = LoraxTemplate(directories=[self.templatedir])
template = t.parse(tfile, tvars) template = t.parse(tfile, tvars)
self.runner = TemplateRunner(self.inroot, self.outroot, template) self.runner = TemplateRunner(template, **tvars)
logger.info("running template commands") logger.info("running template commands")
self.runner.run() self.runner.run()
@ -206,11 +206,13 @@ class TemplateRunner(object):
'copy', 'copyif', 'move', 'moveif', 'remove', 'chmod', 'copy', 'copyif', 'move', 'moveif', 'remove', 'chmod',
'runcmd', 'log') 'runcmd', 'log')
def __init__(self, inroot, outroot, parsed_template, fatalerrors=False): def __init__(self, parsed_template, inroot=None, outroot=None,
fatalerrors=False, **kwargs):
self.template = parsed_template
self.inroot = inroot self.inroot = inroot
self.outroot = outroot self.outroot = outroot
self.template = parsed_template
self.fatalerrors = fatalerrors self.fatalerrors = fatalerrors
self.kwargs = kwargs
self.treeinfo_data = dict() self.treeinfo_data = dict()
self.exists = lambda p: _exists(p, root=inroot) self.exists = lambda p: _exists(p, root=inroot)