diff options
| author | Sol Jerome <solj+dev@soljerome.com> | 2011-05-20 05:44:52 -0700 |
|---|---|---|
| committer | Sol Jerome <solj+dev@soljerome.com> | 2011-05-20 05:44:52 -0700 |
| commit | 7537e34983ccba106d6ddbb0f666bd48b25da3e5 (patch) | |
| tree | b9c1b59fab99fb0aacc093193217c0e8871b4f89 | |
| parent | 80a4142a8d372440d31f4c32d00e70fcab144ba5 (diff) | |
| parent | 87d0e16bb5a5756b8fc62b54a183f5a9c61be3b3 (diff) | |
| download | bcfg2-7537e34983ccba106d6ddbb0f666bd48b25da3e5.tar.gz bcfg2-7537e34983ccba106d6ddbb0f666bd48b25da3e5.tar.bz2 bcfg2-7537e34983ccba106d6ddbb0f666bd48b25da3e5.zip | |
Merge pull request #35 from weiss/fix-genshi-encoding
Cfg: Fix the output encoding of Genshi templates
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 06b4d6ac4..832f7ab41 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -135,9 +135,10 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): metadata=metadata, path=basefile.name).filter(removecomment) try: - data = stream.render('text', strip_whitespace=False) + data = stream.render('text', encoding=self.encoding, + strip_whitespace=False) except TypeError: - data = stream.render('text') + data = stream.render('text', encoding=self.encoding) if data == '': entry.set('empty', 'true') except Exception: |