Merge pull request #24764 from cachedout/ssh_syntax_error

Fix syntax error
This commit is contained in:
Mike Place 2015-06-17 13:59:46 -06:00
commit fc4d4912f0

View File

@ -118,7 +118,7 @@ class FunctionWrapper(object):
if stderr.count('Permission Denied'):
return {'_error': 'Permission Denied',
'stdout': stdout,
'stderr': stderr
'stderr': stderr,
'retcode': retcode}
try:
ret = json.loads(stdout, object_hook=salt.utils.decode_dict)