Commit 4c9dd972 by Michael DeHaan

Fixes for output formatting

parent bb5e4fad
...@@ -80,12 +80,13 @@ def command_generic_msg(hostname, result, oneline, caption): ...@@ -80,12 +80,13 @@ def command_generic_msg(hostname, result, oneline, caption):
buf += stderr buf += stderr
if msg: if msg:
buf += msg buf += msg
buf += "\n"
return buf return buf
else: else:
if stderr: if stderr:
return "%s | %s | rc=%s | (stdout) %s (stderr) %s" % (hostname, caption, rc, stdout, stderr) return "%s | %s | rc=%s | (stdout) %s (stderr) %s\n" % (hostname, caption, rc, stdout, stderr)
else: else:
return "%s | %s | rc=%s | (stdout) %s" % (hostname, caption, rc, stdout) return "%s | %s | rc=%s | (stdout) %s\n" % (hostname, caption, rc, stdout)
def command_success_msg(hostname, result, oneline): def command_success_msg(hostname, result, oneline):
''' output from a successful command run ''' ''' output from a successful command run '''
......
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