diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 17:09:01 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 17:09:01 -0400 |
| commit | b4f4d14e453aaec849e95268e6327fa07e5ff03e (patch) | |
| tree | 77d2bec6a65e98ea7cce9082665c41cca57371c6 /src/lib/Bcfg2/Server/Plugin.py | |
| parent | 80b4ca09bf4a815efd0726b96e3d032f76e1366d (diff) | |
| download | bcfg2-b4f4d14e453aaec849e95268e6327fa07e5ff03e.tar.gz bcfg2-b4f4d14e453aaec849e95268e6327fa07e5ff03e.tar.bz2 bcfg2-b4f4d14e453aaec849e95268e6327fa07e5ff03e.zip | |
fixed handling of regex filename patterns in GroupSpool/EntrySet
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin.py | 5 |
1 files changed, 3 insertions, 2 deletions
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) |