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

Merge pull request #10897 from makinacorpus/return

Browse Source 
salt.runner.jobs: optionnal toggle for output
This commit is contained in:
Thomas S Hatch 2014-03-03 11:03:10 -08:00
commit 7589f4bb26
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/runners/jobs.py
View File

@ -53,7 +53,7 @@ def active():
return ret return ret
def lookup_jid(jid, ext_source=None): def lookup_jid(jid, ext_source=None, output=True):
''' '''
Return the printout from a previously executed job Return the printout from a previously executed job
@ -84,7 +84,8 @@ def lookup_jid(jid, ext_source=None):
for mid, data in client.get_full_returns(jid, [], 0).items(): for mid, data in client.get_full_returns(jid, [], 0).items():
ret[mid] = data.get('ret') ret[mid] = data.get('ret')
salt.output.display_output( if output:
salt.output.display_output(
{mid: ret[mid]}, {mid: ret[mid]},
data.get('out', None), data.get('out', None),
__opts__) __opts__)