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

Fix execute_return_success to return bool or error

Browse Source
This commit is contained in:
twangboy 2016-03-29 13:04:02 -06:00
parent b92c5c709e
commit e88fb40030
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/utils/mac_utils.py
View File

@ -108,14 +108,13 @@ def execute_return_success(cmd):
:return: True if successful, otherwise False
:rtype: bool
:raises: Error if command fails or is not supported
'''
ret = _run_all(cmd)
if 'not supported' in ret['stdout'].lower():
return 'Not supported on this machine'
if ret['retcode'] != 0:
if ret['retcode'] != 0 or 'not supported' in ret['stdout'].lower():
msg = 'Command Failed: {0}\n'.format(cmd)
msg += 'Return Code: {0}\n'.format(ret['retcode'])
msg += 'Output: {0}\n'.format(ret['stdout'])
@ -134,10 +133,12 @@ def execute_return_result(cmd):
:return: The standard out of the command if successful, otherwise returns
an error
:rtype: str
:raises: Error if command fails or is not supported
'''
ret = _run_all(cmd)
if ret['retcode'] != 0:
if ret['retcode'] != 0 or 'not supported' in ret['stdout'].lower():
msg = 'Command Failed: {0}\n'.format(cmd)
msg += 'Return Code: {0}\n'.format(ret['retcode'])
msg += 'Output: {0}\n'.format(ret['stdout'])