From 3388c1c5291eacfd22629ba6351ce0232bca5330 Mon Sep 17 00:00:00 2001 From: Will Woods Date: Mon, 27 Jun 2011 16:03:40 -0400 Subject: [PATCH] fix use of brace_expand in removefrom --- src/pylorax/treebuilder.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index cdc5360a..08ed6340 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -374,8 +374,10 @@ class TemplateRunner(object): self.yum.closeRpmDB() def removefrom(self, pkg, *globs): - globs = set(brace_expand(globs)) - globs_re = re.compile("|".join([fnmatch.translate(g) for g in globs])) + globset = set() + 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)) logger.debug("removing %i files from %s", len(remove), pkg) self.remove(*remove)