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

Merge pull request #41288 from liquidgecka/develop

Browse Source 
Only deal with integer bits in win_service.py.
This commit is contained in:
Mike Place 2017-05-17 11:54:36 -05:00 committed by GitHub
commit eecf2a81b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/win_service.py
View File

@ -717,7 +717,7 @@ def modify(name,
if service_type is not win32service.SERVICE_NO_CHANGE:
flags = list()
for bit in SERVICE_TYPE:
if service_type & bit:
if isinstance(bit, int) and service_type & bit:
flags.append(SERVICE_TYPE[bit])
changes['ServiceType'] = flags if flags else service_type