diff options
Diffstat (limited to 'src/sbin/bcfg2-server')
| -rwxr-xr-x | src/sbin/bcfg2-server | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index a5c5310ba..d26fce9bf 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -41,7 +41,8 @@ class Bcfg2Serv(Bcfg2.Component.Component): try: self.Core = Core(setup['repo'], setup['structures'], - setup['generators'], setup['password'], setup['svn']) + setup['generators'], setup['password'], + setup['svn'], setup['encoding']) except CoreInitError, msg: logger.critical("Fatal error: %s" % (msg)) raise SystemExit, 1 @@ -104,7 +105,7 @@ class Bcfg2Serv(Bcfg2.Component.Component): if isinstance(p, Bcfg2.Server.Plugin.ProbingPlugin)]: for probe in plugin.GetProbes(meta): resp.append(probe) - return tostring(resp) + return tostring(resp, encoding='UTF-8', xml_declaration=True) except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: warning = 'Client metadata resolution error for %s; check server log' % address[0] self.logger.warning(warning) @@ -158,7 +159,7 @@ class Bcfg2Serv(Bcfg2.Component.Component): '''Build config for a client''' try: client = self.Core.metadata.resolve_client(address) - return tostring(self.Core.BuildConfiguration(client)) + return tostring(self.Core.BuildConfiguration(client), encoding='UTF-8', xml_declaration=True) except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: self.logger.warning("Metadata consistency failure for %s" % (address)) raise Fault, (6, "Metadata consistency failure") @@ -201,6 +202,7 @@ if __name__ == '__main__': 'location' : Bcfg2.Options.SERVER_LOCATION, 'passwd' : Bcfg2.Options.SERVER_PASSWORD, 'static' : Bcfg2.Options.SERVER_STATIC, + 'encoding' : Bcfg2.Options.ENCODING, }) |