saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix for trace dump on failing imports for win32com & pythoncom 4 win_task

Browse source
This commit is contained in:
Ronald van Zantvoort 2015-10-19 12:32:34 +02:00
parent a2128c8f80
commit 869e212e81
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/win_task.py
View file

@ -18,8 +18,12 @@ import logging
import time
# Import 3rd Party Libraries
import pythoncom
import win32com.client
try:
import pythoncom
import win32com.client
HAS_DEPENDENCIES = True
except ImportError:
HAS_DEPENDENCIES = False
from salt.ext.six.moves import range
log = logging.getLogger(__name__)
@ -146,6 +150,8 @@ def __virtual__():
Only works on Windows systems
'''
if salt.utils.is_windows():
if not HAS_DEPENDENCIES:
log.warn('Could not load dependencies for {0}'.format(__virtualname__))
return __virtualname__
return False