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/Plugins/TGenshi.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/Plugins/TGenshi.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/TGenshi.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/TGenshi.py b/src/lib/Bcfg2/Server/Plugins/TGenshi.py index c84e0a506..c7335a0c0 100644 --- a/src/lib/Bcfg2/Server/Plugins/TGenshi.py +++ b/src/lib/Bcfg2/Server/Plugins/TGenshi.py @@ -31,7 +31,7 @@ def removecomment(stream): yield kind, data, pos -class TemplateFile: +class TemplateFile(object): """Template file creates Genshi template structures for the loaded file.""" def __init__(self, name, specific, encoding): @@ -121,6 +121,10 @@ class TemplateFile: raise Bcfg2.Server.Plugin.PluginExecutionError('Genshi template loading error: %s' % err) +class TemplateEntrySet(Bcfg2.Server.Plugin.EntrySet): + basename_is_regex = True + + class TGenshi(Bcfg2.Server.Plugin.GroupSpool): """ The TGenshi generator implements a templating @@ -130,5 +134,6 @@ class TGenshi(Bcfg2.Server.Plugin.GroupSpool): name = 'TGenshi' __author__ = 'jeff@ocjtech.us' filename_pattern = 'template\.(txt|newtxt|xml)' + es_cls = TemplateEntrySet es_child_cls = TemplateFile deprecated = True |