From 326e649ef1f14b609916f0e9ce75e29a5e7f4d05 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Mon, 19 Nov 2018 17:52:34 +0100 Subject: [PATCH] azurefs: gracefully handle AttributeError It is possible that the azure.storage object has no __version__ defined. In that case, prevent console spam with unhandled AttributeError messages and instead consider that Azure support is not present. Problem was encountered on openSUSE Tumbleweed. --- salt/fileserver/azurefs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/fileserver/azurefs.py b/salt/fileserver/azurefs.py index c266323fbe..a42c10c594 100644 --- a/salt/fileserver/azurefs.py +++ b/salt/fileserver/azurefs.py @@ -68,7 +68,7 @@ try: if LooseVersion(azure.storage.__version__) < LooseVersion('0.20.0'): raise ImportError('azure.storage.__version__ must be >= 0.20.0') HAS_AZURE = True -except ImportError: +except (ImportError, AttributeError): HAS_AZURE = False # Import third party libs -- 2.20.1