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

treebuilder fixup: use directories param for LoraxTemplate

Browse Source
This commit is contained in:
Will Woods 2011-05-09 23:45:35 -04:00
parent a15c5ded9c
commit 411bea7d4e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pylorax/treebuilder.py
View File

@ -67,11 +67,12 @@ def _exists(root, p):
return (len(glob.glob(p)) > 0) return (len(glob.glob(p)) > 0)
class BaseBuilder(object): class BaseBuilder(object):
def __init__(self, product, arch, inroot, outroot): def __init__(self, product, arch, inroot, outroot, templatedir=None):
self.arch = arch self.arch = arch
self.product = product self.product = product
self.inroot = inroot self.inroot = inroot
self.outroot = outroot self.outroot = outroot
self.templatedir = templatedir
self.runner = None self.runner = None
def getdefaults(self): def getdefaults(self):
@ -83,7 +84,7 @@ class BaseBuilder(object):
def runtemplate(self, templatefile, **variables): def runtemplate(self, templatefile, **variables):
for k,v in self.getdefaults().items(): for k,v in self.getdefaults().items():
variables.setdefault(k,v) # setdefault won't override existing args variables.setdefault(k,v) # setdefault won't override existing args
t = LoraxTemplate() t = LoraxTemplate(directories=[self.templatedir])
logger.info("parsing %s with the following variables", templatefile) logger.info("parsing %s with the following variables", templatefile)
for key, val in variables.items(): for key, val in variables.items():
logger.info(" %s: %s", key, val) logger.info(" %s: %s", key, val)