summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHolger Weiß <holger@zedat.fu-berlin.de>2011-05-19 23:08:48 +0200
committerSol Jerome <sol.jerome@gmail.com>2011-06-14 12:36:45 -0500
commite081a2355c6afa182359bd44aa74ad45f16636f2 (patch)
treeac10b3f5fcb47ca0f8b61cd45b063754a841347a /src
parent065724b38235cb8ba4aa493f43a3f4f426ac1abd (diff)
downloadbcfg2-e081a2355c6afa182359bd44aa74ad45f16636f2.tar.gz
bcfg2-e081a2355c6afa182359bd44aa74ad45f16636f2.tar.bz2
bcfg2-e081a2355c6afa182359bd44aa74ad45f16636f2.zip
Revert "bcfg2: Write cached config using encoding from Options.py"
This reverts commit 5d69ff7e966c4ffa911c78d11a6879b48e90aef8. As the "rawconfig" variable now holds a UTF-8 encoded string, it would have to be decoded before re-encoding it using a different encoding. However, the cached configuration shouldn't be written using a non-UTF-8 encoding anyway, as "bcfg2 -f <configuration>" currently doesn't accept any other encodings. (If this is to be changed, the XML encoding declaration of the configuration would have to be adjusted accordingly.)
Diffstat (limited to 'src')
-rwxr-xr-xsrc/sbin/bcfg22
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 996d773ff..eb41af640 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -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" %