valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only load module if windows required imports are available.

Browse Source 
Seems the way to do it and also stops an import traceback to be logged on Linux when importing `salt.utils.winapi`.
This commit is contained in:
Pedro Algarvio 2013-05-28 11:57:41 +01:00
parent 62be15c68c
commit fb14e72aef
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/win_network.py
View File

@ -7,23 +7,25 @@ import re
# Import salt libs
import salt.utils
import salt.utils.winapi
from salt.utils.socket_util import sanitize_host
try:
import salt.utils.winapi
HAS_DEPENDENCIES = True
except ImportError:
HAS_DEPENDENCIES = False
# Import 3rd party libraries
HAS_WMI = False
try:
import wmi
HAS_WMI = True
except ImportError:
pass
HAS_DEPENDENCIES = False
def __virtual__():
'''
Only works on Windows systems
'''
if salt.utils.is_windows():
if salt.utils.is_windows() and HAS_DEPENDENCIES is True:
return 'network'
return False