valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
Thomas Jackson 2014-12-24 13:08:26 -08:00
parent 89cbd19dce
commit f455281fd4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/runner.py
View File

@ -110,8 +110,8 @@ class RunnerClient(mixins.SyncClientMixin, mixins.AsyncClientMixin, object):
load = kwargs
load['cmd'] = 'runner'
channel = salt.transport.Channel.factory(self.opts,
crypt='clear',
usage='master_call')
crypt='clear',
usage='master_call')
ret = channel.send(load)
if isinstance(ret, collections.Mapping):
if 'error' in ret:
@ -263,7 +263,7 @@ class Runner(RunnerClient):
tag_parts = raw['tag'].split('/')
if tag_parts[3] == 'progress':
last_progress_timestamp = time.time()
yield {'data': raw['data']['data'], 'outputter': raw['data']['outputter']}
yield raw['data']
elif tag_parts[3] == 'ret':
yield raw['data']['return']
break