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

Added additional reporting

Browse source
This commit is contained in:
twangboy 2015-06-16 14:38:13 -06:00
parent d84ad5d519
commit 7a015389af
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/states/win_servermanager.py
View file

@ -38,7 +38,7 @@ def installed(name, recurse=False, force=False):
if name not in __salt__['win_servermanager.list_installed']():
ret['changes'] = {'feature': '{0} will be installed recurse={1}'.format(name, recurse)}
elif force and recurse:
ret['changes'] = {'feature': 'Already installed but might install sub-features'.format(name)}
ret['changes'] = {'feature': '{0} already installed but might install sub-features'.format(name)}
else:
ret['comment'] = 'The feature {0} is already installed'.format(name)
return ret
@ -53,7 +53,9 @@ def installed(name, recurse=False, force=False):
if 'Success' in ret['changes']['feature']:
ret['result'] = ret['changes']['feature']['Success'] == 'True'
if not ret['result']:
ret['comment'] = 'Failed to install the feature: {0}'.format(ret['changes']['feature']['ExitCode'])
ret['comment'] = 'Failed to install {0}: {1}'.format(name, ret['changes']['feature']['ExitCode'])
else:
ret['comment'] = 'Installed {0}'.format(name)
else:
ret['result'] = False
ret['comment'] = 'Failed to install {0}.\nError Message:\n{1}'.format(name, ret['changes']['feature']['message'])