From f954f69574e83d9b3d6e4780a207b40fc3cc5203 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 28 Nov 2021 19:40:59 +0100 Subject: [PATCH] Suppress error message when NDA plugins directory does not exists. --- cumulus/src/plugins/__init__.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cumulus/src/plugins/__init__.py b/cumulus/src/plugins/__init__.py index 42bd0d8d..509617b4 100644 --- a/cumulus/src/plugins/__init__.py +++ b/cumulus/src/plugins/__init__.py @@ -250,12 +250,15 @@ def staticInitialization (): if helpers.ndaTopDir: vprint( 1, ' o Preload NDA protected plugins.' ) - pluginsDir = os.path.join( helpers.ndaTopDir, 'python{}.{}/site-packages/cumulus/plugins' \ - .format( sys.version_info.major - , sys.version_info.minor )) - loadPlugins( pluginsDir ) + pythonDir =os.path.join( helpers.ndaTopDir, 'python{}.{}'.format( sys.version_info.major + , sys.version_info.minor )) + if os.path.isdir(pythonDir): + pluginsDir = os.path.join( pythonDir, 'site-packages/cumulus/plugins' ) + loadPlugins( pluginsDir ) + else: + vprint( 1, ' - No NDA protected plugins directory.' ) else: - vprint( 1, ' o No NDA protected plugins.' ) + vprint( 1, ' - No NDA protected plugins.' ) except Exception as e: helpers.showPythonTrace( __file__, e ) loaded = True