From b4f4d14e453aaec849e95268e6327fa07e5ff03e Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 22 Aug 2012 17:09:01 -0400 Subject: fixed handling of regex filename patterns in GroupSpool/EntrySet --- src/lib/Bcfg2/Server/Plugin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugin.py') diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index f858c7b44..f841cef22 100644 --- a/src/lib/Bcfg2/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -1063,8 +1063,9 @@ class SpecificData(object): class EntrySet(Debuggable): """Entry sets deal with the host- and group-specific entries.""" ignore = re.compile("^(\.#.*|.*~|\\..*\\.(sw[px])|.*\\.genshi_include)$") + basename_is_regex=False - def __init__(self, basename, path, entry_type, encoding, is_regex=False): + def __init__(self, basename, path, entry_type, encoding): Debuggable.__init__(self, name=basename) self.path = path self.entry_type = entry_type @@ -1073,7 +1074,7 @@ class EntrySet(Debuggable): self.infoxml = None self.encoding = encoding - if is_regex: + if self.basename_is_regex: base_pat = basename else: base_pat = re.escape(basename) -- cgit v1.2.3-1-g7c22