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

Improve error on mac_utils

Browse Source
This commit is contained in:
twangboy 2016-03-21 16:20:31 -06:00
parent 58cd2a7c9a
commit ea823932c2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/mac_utils.py
View File

@ -115,6 +115,7 @@ def execute_return_success(cmd):
msg = 'Command Failed: {0}\n'.format(cmd) msg = 'Command Failed: {0}\n'.format(cmd)
msg += 'Return Code: {0}\n'.format(ret['retcode']) msg += 'Return Code: {0}\n'.format(ret['retcode'])
msg += 'Output: {0}\n'.format(ret['stdout']) msg += 'Output: {0}\n'.format(ret['stdout'])
msg += 'Error: {0}\n'.format(ret['stderr'])
raise CommandExecutionError(msg) raise CommandExecutionError(msg)
return True return True
@ -133,7 +134,10 @@ def execute_return_result(cmd):
ret = _run_all(cmd) ret = _run_all(cmd)
if ret['retcode'] != 0: if ret['retcode'] != 0:
msg = 'Command failed: {0}'.format(ret['stderr']) msg = 'Command Failed: {0}\n'.format(cmd)
msg += 'Return Code: {0}\n'.format(ret['retcode'])
msg += 'Output: {0}\n'.format(ret['stdout'])
msg += 'Error: {0}\n'.format(ret['stderr'])
raise CommandExecutionError(msg) raise CommandExecutionError(msg)
return ret['stdout'] return ret['stdout']