make treebuilder._glob return relative paths when using root=
This commit is contained in:
parent
0598b13ad1
commit
f1963a2102
@ -64,11 +64,11 @@ def findkernels(root="/", kdir="boot"):
|
|||||||
|
|
||||||
return kernels
|
return kernels
|
||||||
|
|
||||||
def _glob(globpat, root="", fatal=True):
|
def _glob(globpat, root="/", fatal=True):
|
||||||
files_found = glob.glob(joinpaths(root, globpat))
|
files_found = glob.glob(joinpaths(root, globpat))
|
||||||
if fatal and not files_found:
|
if fatal and not files_found:
|
||||||
raise IOError, "nothing matching %s" % joinpaths(root, globpat)
|
raise IOError, "nothing matching %s" % joinpaths(root, globpat)
|
||||||
return files_found
|
return [f.replace(root+os.path.sep,"",1) for f in files_found]
|
||||||
|
|
||||||
def _exists(path, root=""):
|
def _exists(path, root=""):
|
||||||
return (len(_glob(path, root, fatal=False)) > 0)
|
return (len(_glob(path, root, fatal=False)) > 0)
|
||||||
@ -253,7 +253,7 @@ class TemplateRunner(object):
|
|||||||
logger.error(str(e))
|
logger.error(str(e))
|
||||||
|
|
||||||
def install(self, srcglob, dest):
|
def install(self, srcglob, dest):
|
||||||
for src in _glob(srcglob, root=self.inroot):
|
for src in _glob(self._in(srcglob)):
|
||||||
cpfile(src, self._out(dest))
|
cpfile(src, self._out(dest))
|
||||||
|
|
||||||
def mkdir(self, *dirs):
|
def mkdir(self, *dirs):
|
||||||
@ -264,7 +264,7 @@ class TemplateRunner(object):
|
|||||||
|
|
||||||
def replace(self, pat, repl, *fileglobs):
|
def replace(self, pat, repl, *fileglobs):
|
||||||
for g in fileglobs:
|
for g in fileglobs:
|
||||||
for f in _glob(g, root=self.outroot):
|
for f in _glob(self._in(g)):
|
||||||
replace(f, pat, repl)
|
replace(f, pat, repl)
|
||||||
|
|
||||||
def append(self, filename, data):
|
def append(self, filename, data):
|
||||||
|
Loading…
Reference in New Issue
Block a user