almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

fix use of brace_expand in removefrom

Browse Source
This commit is contained in:
Will Woods 2011-06-27 16:03:40 -04:00
parent 741fbc7b43
commit 3388c1c529
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pylorax/treebuilder.py
View File

@ -374,8 +374,10 @@ class TemplateRunner(object):
self.yum.closeRpmDB() self.yum.closeRpmDB()
def removefrom(self, pkg, *globs): def removefrom(self, pkg, *globs):
globs = set(brace_expand(globs)) globset = set()
globs_re = re.compile("|".join([fnmatch.translate(g) for g in globs])) for g in globs:
globset.update(brace_expand(g))
globs_re = re.compile("|".join([fnmatch.translate(g) for g in globset]))
remove = filter(globs_re.match, self._filelist(pkg)) remove = filter(globs_re.match, self._filelist(pkg))
logger.debug("removing %i files from %s", len(remove), pkg) logger.debug("removing %i files from %s", len(remove), pkg)
self.remove(*remove) self.remove(*remove)