From f940deb8419060c6a5685ad460efa232ba1a8aad Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 17 Aug 2009 16:49:01 +0000 Subject: POSIX: Fix traceback with ConfigFile encoding errors (Ticket #705) Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5410 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/POSIX.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/Client/Tools/POSIX.py b/src/lib/Client/Tools/POSIX.py index 8576f49fa..55e83d822 100644 --- a/src/lib/Client/Tools/POSIX.py +++ b/src/lib/Client/Tools/POSIX.py @@ -357,7 +357,12 @@ class POSIX(Bcfg2.Client.Tools.Tool): return False tempdata = entry.text if type(tempdata) == unicode: - tempdata = tempdata.encode(self.setup['encoding']) + try: + tempdata = tempdata.encode(self.setup['encoding']) + except UnicodeEncodeError, e: + self.logger.error("Error encoding file %s:\n %s" % \ + (entry.get('name'), e)) + return False try: content = open(entry.get('name')).read() except IOError, error: -- cgit v1.2.3-1-g7c22