From 54da813bc88a19e7227e30b4160de6aa6ccb7d7b Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Sun, 2 Dec 2007 01:33:14 +0000
Subject: Harden frame against tool driver syntax errors (Related to #507)
 [bugfix]

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4020 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Client/Frame.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib/Client/Frame.py')

diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index b19594402..b341d65fd 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -61,10 +61,15 @@ class Frame:
         for tool in tools:
             tool_class = "Bcfg2.Client.Tools.%s" % tool
             try:
-                tclass[tool] = getattr(__import__(tool_class, globals(), locals(), ['*']),
+                tclass[tool] = getattr(__import__(tool_class, globals(),
+                                                  locals(), ['*']),
                                        tool)
             except ImportError:
                 continue
+            except:
+                self.logger.error("Tool %s unexpectedly failed to load" % tool,
+                                  exc_info=1)
+                                  
 
         for tool in tclass.values():
             try:
-- 
cgit v1.2.3-1-g7c22