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

treebuilder fixups: correct args for parse() and RuntimeBuilder, add rb.yum

Browse Source
This commit is contained in:
Will Woods 2011-05-26 13:07:30 -04:00
parent bbf3d23513
commit 7feb3d4572
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

@ -78,7 +78,7 @@ class TemplateParser(object):
self.templatedir = templatedir self.templatedir = templatedir
self.defaults = defaults self.defaults = defaults
def parse(templatefile, variables): def parse(self, templatefile, variables):
for k,v in self.defaults.items(): for k,v in self.defaults.items():
variables.setdefault(k,v) variables.setdefault(k,v)
logger.info("parsing %s with the following variables", templatefile) logger.info("parsing %s with the following variables", templatefile)
@ -91,13 +91,14 @@ class RuntimeBuilder(object):
'''Builds the anaconda runtime image. '''Builds the anaconda runtime image.
inroot will be the same as outroot, so 'install' == 'copy'.''' inroot will be the same as outroot, so 'install' == 'copy'.'''
# XXX product.name = product.name.lower()? # XXX product.name = product.name.lower()?
def __init__(self, product, arch, yum, outroot, templatedir=None): def __init__(self, product, arch, outroot, yum, templatedir=None):
v = DataHolder(arch=arch, product=product, yum=yum, v = DataHolder(arch=arch, product=product, yum=yum,
outroot=outroot, inroot=outroot, root=outroot, outroot=outroot, inroot=outroot, root=outroot,
basearch=arch.basearch, libdir=arch.libdir, basearch=arch.basearch, libdir=arch.libdir,
exists = lambda p: _exists(p, root=self.root), exists = lambda p: _exists(p, root=self.root),
glob = lambda g: _glob(g, root=self.root, Fatal=False)) glob = lambda g: _glob(g, root=self.root, Fatal=False))
self.vars = v self.vars = v
self.yum = yum
self.templatedir = templatedir self.templatedir = templatedir
def runtemplate(self, templatefile, **variables): def runtemplate(self, templatefile, **variables):