Merge pull request #1562 from dagwieers/oneline-fix

Make --oneline return one line (except with multiline output)
pull/1648/head
Michael DeHaan 12 years ago
commit a31ca213a5

@ -153,9 +153,9 @@ def command_generic_msg(hostname, result, oneline, caption):
return buf + "\n"
else:
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:
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):
''' summarize the JSON results for a particular host '''

Loading…
Cancel
Save