From e77f142847845ebc14ac038bd07028b09d90b824 Mon Sep 17 00:00:00 2001 From: Will Woods Date: Tue, 10 May 2011 17:46:37 -0400 Subject: [PATCH] fix _glob and template glob() --- src/pylorax/treebuilder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 2d8e7cea..dac64ee9 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -63,10 +63,10 @@ def findkernels(root="/", kdir="boot"): return kernels -def _glob(glob, root="", fatal=True): - files_found = glob.glob(os.path.join(root, glob)) +def _glob(globpat, root="", fatal=True): + files_found = glob.glob(os.path.join(root, globpat)) if fatal and not files_found: - raise IOError, "nothing matching %s" % os.path.join(root, glob) + raise IOError, "nothing matching %s" % os.path.join(root, globpat) return files_found def _exists(path, root=""): @@ -95,7 +95,7 @@ class BaseBuilder(object): logger.info(" %s: %s", key, val) # set up functions for template tvars.setdefault('exists', lambda p: _exists(p, root=tvars['inroot'])) - tvars.setdefault('glob', lambda g: glob(g, root=tvars['inroot'])) + tvars.setdefault('glob', lambda g: _glob(g, root=tvars['inroot'])) # parse and run the template t = LoraxTemplate(directories=[self.templatedir]) template = t.parse(tfile, tvars)