diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-22 07:58:01 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-22 13:11:55 -0500 |
| commit | a3998969ec25acf20d5e42a1166e001288ca7b0e (patch) | |
| tree | 5122b0bbbb383646a448587334c59b5867a7cec7 /src/lib/Bcfg2/Options/Actions.py | |
| parent | 474462ff24e8f29d715ee80ee0c07acb16eb1dab (diff) | |
| download | bcfg2-a3998969ec25acf20d5e42a1166e001288ca7b0e.tar.gz bcfg2-a3998969ec25acf20d5e42a1166e001288ca7b0e.tar.bz2 bcfg2-a3998969ec25acf20d5e42a1166e001288ca7b0e.zip | |
fixed some places where plugin loading should fail silently
Diffstat (limited to 'src/lib/Bcfg2/Options/Actions.py')
| -rw-r--r-- | src/lib/Bcfg2/Options/Actions.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Options/Actions.py b/src/lib/Bcfg2/Options/Actions.py index 2916cc194..854e6039d 100644 --- a/src/lib/Bcfg2/Options/Actions.py +++ b/src/lib/Bcfg2/Options/Actions.py @@ -113,9 +113,12 @@ class ComponentAction(FinalizableAction): try: return getattr(__import__(module, fromlist=[name]), name) except (AttributeError, ImportError): + msg = "Failed to load %s from %s: %s" % (name, module, + sys.exc_info()[1]) if not self.fail_silently: - print("Failed to load %s from %s: %s" % - (name, module, sys.exc_info()[1])) + print(msg) + else: + _debug(msg) return None def _load_component(self, name): @@ -181,3 +184,4 @@ class PluginsAction(ComponentAction): """ :class:`Bcfg2.Options.ComponentAction` subclass for loading Bcfg2 server plugins. """ bases = ['Bcfg2.Server.Plugins'] + fail_silently = True |