summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2004-09-29 18:48:39 +0000
committerNarayan Desai <desai@mcs.anl.gov>2004-09-29 18:48:39 +0000
commit281b0c8925f5f27698d56ebf58278cb51bb4ce72 (patch)
treea4880d8b3a21b1041110940064061926a06ff2fa
parent3ed5f8323f33095ab07468af0a5f1440d3b90585 (diff)
downloadbcfg2-281b0c8925f5f27698d56ebf58278cb51bb4ce72.tar.gz
bcfg2-281b0c8925f5f27698d56ebf58278cb51bb4ce72.tar.bz2
bcfg2-281b0c8925f5f27698d56ebf58278cb51bb4ce72.zip
fix base64 encoding
(Logical change 1.64) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@338 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Generators/cfg.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/Server/Generators/cfg.py b/src/lib/Server/Generators/cfg.py
index 9ceedab01..efb5a9265 100644
--- a/src/lib/Server/Generators/cfg.py
+++ b/src/lib/Server/Generators/cfg.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+from binascii import b2a_base64
from os import stat
from re import compile
from stat import S_ISDIR, ST_MODE
@@ -119,7 +120,10 @@ class ConfigFileEntry(object):
entry.attrib.update({'owner':self.owner, 'group':self.group, 'perms':self.perms, 'encoding':self.encoding})
if self.paranoid:
entry.attrib['paranoid'] = 'true'
- entry.text = filedata
+ if self.encoding == 'base64':
+ entry.text = b2a_base64(filedata)
+ else:
+ entry.text = filedata
class ConfigFileRepository(DirectoryBacked):
'''This class implements repos and all change handling'''