Skip to content

Commit 5bdbaae

Browse files
committed
Better fix for package version check
1 parent 1bb7749 commit 5bdbaae

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

salt/utils/cloud.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,20 @@
7777

7878

7979
try:
80+
import importlib
81+
import importlib.metadata
82+
8083
# Verify WinRM 0.3.0 or greater
81-
import winrm
82-
from winrm.exceptions import WinRMTransportError
8384

84-
if not salt.utils.versions.compare(winrm.__version__, ">=", WINRM_MIN_VER):
85+
version = importlib.metadata.version("winerm")
86+
if not salt.utils.versions.compare(version, ">=", WINRM_MIN_VER):
8587
HAS_WINRM = False
8688
else:
8789
HAS_WINRM = True
8890

91+
import winrm
92+
from winrm.exceptions import WinRMTransportError
93+
8994
except ImportError:
9095
HAS_WINRM = False
9196

0 commit comments

Comments
 (0)