summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj+dev@soljerome.com>2011-05-19 15:19:22 -0700
committerSol Jerome <solj+dev@soljerome.com>2011-05-19 15:19:22 -0700
commit9bb5fca8f650b1ef46eaccd5603178f5ec2e10fd (patch)
tree24a493ac52bb4c3ea6a51da65be2f165fa88bad2
parenta7057ddac01f3e3a128448d806f4fb4e2e4876f6 (diff)
parent85d52b2426b0f980e1b42ec8f90c888bbf68ce54 (diff)
downloadbcfg2-9bb5fca8f650b1ef46eaccd5603178f5ec2e10fd.tar.gz
bcfg2-9bb5fca8f650b1ef46eaccd5603178f5ec2e10fd.tar.bz2
bcfg2-9bb5fca8f650b1ef46eaccd5603178f5ec2e10fd.zip
Merge pull request #33 from weiss/fix-spec-encoding
bcfg2: Convert specification from Unicode to UTF-8
-rwxr-xr-xsrc/sbin/bcfg24
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 7f7d8f5c6..eb41af640 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -243,7 +243,7 @@ class Client:
raise SystemExit(1)
try:
- rawconfig = proxy.GetConfig()
+ rawconfig = proxy.GetConfig().encode('UTF-8')
except xmlrpclib.Fault:
self.logger.error("Failed to download configuration from Bcfg2")
raise SystemExit(2)
@@ -252,7 +252,7 @@ class Client:
if self.setup['cache']:
try:
- open(self.setup['cache'], 'w').write(rawconfig.encode(self.setup['encoding']))
+ open(self.setup['cache'], 'w').write(rawconfig)
os.chmod(self.setup['cache'], 33152)
except IOError:
self.logger.warning("Failed to write config cache file %s" %