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

Fixed problem with win_servermanager.list_installed

Browse source
This commit is contained in:
twangboy 2015-07-24 14:20:13 -06:00
parent ea0d295d49
commit 82fa911931
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/modules/win_servermanager.py
View file

@ -3,7 +3,7 @@
Manage Windows features via the ServerManager powershell module
'''
from __future__ import absolute_import
import logging
# Import python libs
try:
@ -14,6 +14,8 @@ except ImportError:
# Import salt libs
import salt.utils
log = logging.getLogger(__name__)
def __virtual__():
'''
@ -68,7 +70,8 @@ def list_available():
def list_installed():
'''
List installed features
List installed features. Supported on Windows Server 2008 and Windows 8 and
newer.
CLI Example:
@ -83,10 +86,12 @@ def list_installed():
name = splt.pop(-1)
display_name = ' '.join(splt)
ret[name] = display_name
state = _srvmgr('Get-WindowsFeature -erroraction silentlycontinue -warningaction silentlycontinue | Select InstallState,Name')
state = _srvmgr('Get-WindowsFeature -erroraction silentlycontinue -warningaction silentlycontinue | Select Installed,Name')
for line in state.splitlines()[2:]:
splt = line.split()
if splt[0] != 'Installed' and splt[1] in ret:
if splt[0] == 'False' and splt[1] in ret:
del ret[splt[1]]
if '----' in splt[0]:
del ret[splt[1]]
return ret