Modify ↓
Ticket #571 (closed defect: fixed)
SGenshi left out of encoding update
Reported by: | solj | Owned by: | desai |
---|---|---|---|
Priority: | major | Milestone: | Bcfg2 0.9.6 Release |
Component: | bcfg2-server | Version: | |
Keywords: | Cc: |
Description
This should help
Index: src/lib/Server/Plugins/SGenshi.py =================================================================== --- src/lib/Server/Plugins/SGenshi.py (revision 4739) +++ src/lib/Server/Plugins/SGenshi.py (working copy) @@ -16,7 +16,7 @@ return lxml.etree.XML(data) class SGenshiEntrySet(Bcfg2.Server.Plugin.EntrySet): - def __init__(self, path, fam): + def __init__(self, path, fam, encoding): fpattern = '\S+\.xml' try: properties = Bcfg2.Server.Plugin.TemplateProperties( \ @@ -24,8 +24,8 @@ except: properties = Bcfg2.Server.Plugin.FakeProperties() - Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path, - properties, SGenshiTemplateFile) + Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path, properties + SGenshiTemplateFile, encoding) fam.AddMonitor(path, self) def HandleEvent(self, event): @@ -53,7 +53,7 @@ def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) try: - SGenshiEntrySet.__init__(self, self.data, self.core.fam) + SGenshiEntrySet.__init__(self, self.data, self.core.fam, core.encoding) except: logger.error("Failed to load SGenshi repository; disabling SGenshi") raise Bcfg2.Server.Plugin.PluginInitError
Attachments
Change History
Note: See
TracTickets for help on using
tickets.
Whoops, there should be a comma after properties.