summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-06-08 19:48:20 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-06-08 19:51:29 -0500
commit844b02afe60de45310fd88be75686dffc21c37aa (patch)
treed4d14b5a919102d6a13fb1ed928080418cb3d6b3
parent20a30233260a842f13408d0a8a8c23d1e7707a1b (diff)
downloadbcfg2-844b02afe60de45310fd88be75686dffc21c37aa.tar.gz
bcfg2-844b02afe60de45310fd88be75686dffc21c37aa.tar.bz2
bcfg2-844b02afe60de45310fd88be75686dffc21c37aa.zip
POSIX: Fix support for unicode files
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--src/lib/Bcfg2/Client/Tools/POSIX/File.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
index 168c35c98..6525b02e0 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
@@ -163,6 +163,8 @@ class POSIXFile(POSIXTool):
# prompts for -I and the reports
try:
content = open(entry.get('name')).read()
+ except UnicodeDecodeError:
+ content = open(entry.get('name'), encoding='utf-8').read()
except IOError:
self.logger.error("POSIX: Failed to read %s: %s" %
(entry.get("name"), sys.exc_info()[1]))