diff options
| -rw-r--r-- | src/lib/Server/Plugins/TCheetah.py | 4 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-info | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Server/Plugins/TCheetah.py index beff8e869..901a05521 100644 --- a/src/lib/Server/Plugins/TCheetah.py +++ b/src/lib/Server/Plugins/TCheetah.py @@ -28,7 +28,7 @@ class TemplateFile(FileBacked): try: entry.text = str(self.template) except: - logger.error("Failed to template %s" % entry.get('name')) + logger.error("Failed to template %s" % entry.get('name'), exc_info=1) raise PluginExecutionError perms = {'owner':'root', 'group':'root', 'perms':'0644'} [entry.attrib.__setitem__(key, value) for (key, value) in perms.iteritems()] @@ -87,7 +87,7 @@ class TCheetah(Plugin): if self.entries.has_key(identifier): self.entries[identifier].HandleEvent(event) elif action == 'deleted': - if self.entries.has_key[identifier]: + if self.entries.has_key(identifier): del self.entries[identifier] del self.Entries['ConfigFile'][identifier] diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 7789b78da..9b7e87473 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -2,7 +2,7 @@ '''This tool loads the Bcfg2 core into an interactive debugger''' __revision__ = '$Revision$' -import logging, lxml.etree, sys, time, Bcfg2.Logging, Bcfg2.Server.Core, Bcfg2.Server.Metadata +import logging, lxml.etree, sys, time, Bcfg2.Logging, Bcfg2.Server.Core, Bcfg2.Server.Metadata, Bcfg2.Server.Plugin def printTabular(rows): '''print data in tabular format''' @@ -188,6 +188,8 @@ if __name__ == '__main__': dispatch[ucmd[0]](ucmd, bcore) except SystemExit, code: raise SystemExit, code + except Bcfg2.Server.Plugin.PluginExecutionError: + continue except: logger.error("command failure", exc_info=1) else: |