Skip to content

A
ansible
Commit a31ca213 by Michael DeHaan
Options

Merge pull request #1562 from dagwieers/oneline-fix 

Make --oneline return one line (except with multiline output)
parents 03f4b0f9 d42eb256
Showing with 2 additions and 2 deletions
lib/ansible/callbacks.py
...@@ -153,9 +153,9 @@ def command_generic_msg(hostname, result, oneline, caption): ...@@ -153,9 +153,9 @@ def command_generic_msg(hostname, result, oneline, caption):
return buf + "\n" return buf + "\n"
else: else:
if stderr: if stderr:
return "%s | %s | rc=%s | (stdout) %s (stderr) %s\n" % (hostname, caption, rc, stdout, stderr) return "%s | %s | rc=%s | (stdout) %s (stderr) %s" % (hostname, caption, rc, stdout, stderr)
else: else:
return "%s | %s | rc=%s | (stdout) %s\n" % (hostname, caption, rc, stdout) return "%s | %s | rc=%s | (stdout) %s" % (hostname, caption, rc, stdout)
def host_report_msg(hostname, module_name, result, oneline): def host_report_msg(hostname, module_name, result, oneline):
''' summarize the JSON results for a particular host ''' ''' summarize the JSON results for a particular host '''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment