diff options
| author | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-04-13 15:16:06 +0200 |
|---|---|---|
| committer | Holger Weiß <holger@zedat.fu-berlin.de> | 2011-04-13 15:16:06 +0200 |
| commit | 87d0e16bb5a5756b8fc62b54a183f5a9c61be3b3 (patch) | |
| tree | ac10b3f5fcb47ca0f8b61cd45b063754a841347a /src | |
| parent | 9bb5fca8f650b1ef46eaccd5603178f5ec2e10fd (diff) | |
| download | bcfg2-87d0e16bb5a5756b8fc62b54a183f5a9c61be3b3.tar.gz bcfg2-87d0e16bb5a5756b8fc62b54a183f5a9c61be3b3.tar.bz2 bcfg2-87d0e16bb5a5756b8fc62b54a183f5a9c61be3b3.zip | |
Cfg: Fix the output encoding of Genshi templates
Encode the configuration files generated from Genshi templates according
to the encoding setting from Options.py instead of unconditionally using
UTF-8.
Diffstat (limited to 'src')
| -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: |