mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Change to dict instead of error
This commit is contained in:
parent
6510e0a5b0
commit
d9b848c0d9
1 changed files with 10 additions and 3 deletions
|
@ -80,8 +80,12 @@ def add_capability(capability,
|
|||
'`install_capability` is not available on this version of Windows: '
|
||||
'{0}'.format(__grains__['osversion']))
|
||||
|
||||
ret = {'comment': '',
|
||||
'changes': None}
|
||||
|
||||
if capability in installed_capabilities():
|
||||
raise CommandExecutionError('{0} already installed.'.format(capability))
|
||||
ret['comment'] = '{0} already installed'.format(capability)
|
||||
return ret
|
||||
|
||||
cmd = ['DISM',
|
||||
'/Quiet',
|
||||
|
@ -97,9 +101,12 @@ def add_capability(capability,
|
|||
cmd.append('/NoRestart')
|
||||
|
||||
status = __salt__['cmd.run_all'](cmd)
|
||||
|
||||
return status
|
||||
|
||||
if status['retcode'] != 0:
|
||||
raise CommandExecutionError(
|
||||
'Failed to install {0}: {1}'.format(capability, status['stdout']))
|
||||
ret['comment'] = \
|
||||
'Failed to install {0}: {1}'.format(capability, status['stdout'])
|
||||
|
||||
return capability in installed_capabilities()
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue