Modify

Ticket #571 (closed defect: fixed)

Opened 14 years ago

Last modified 14 years ago

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

comment:1 Changed 14 years ago by solj

Whoops, there should be a comma after properties.

comment:2 Changed 14 years ago by desai

  • Status changed from new to closed
  • Resolution set to fixed

Committed in [b3991df79b0bdf25465de1f1b49f910d7f952258] (SVN r4744). Thanks for the patch.

WARNING! You need to establish a session before you can create or edit tickets. Otherwise the ticket will get treated as spam.

View

Add a comment

Modify Ticket

Change Properties
<Author field>
Action
as closed
The resolution will be deleted. Next status will be 'reopened'
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.