Commit 24f6f656 by Michael DeHaan

Merge branch 'bug8392' of git://github.com/gnosek/ansible into devel

parents c5f92597 7f33580e
......@@ -1041,11 +1041,11 @@ def filter_leading_non_json_lines(buf):
filter only leading lines since multiline JSON is valid.
'''
kv_regex = re.compile(r'.*\w+=\w+.*')
kv_regex = re.compile(r'\w=\w')
filtered_lines = StringIO.StringIO()
stop_filtering = False
for line in buf.splitlines():
if stop_filtering or kv_regex.match(line) or line.startswith('{') or line.startswith('['):
if stop_filtering or line.startswith('{') or line.startswith('[') or kv_regex.search(line):
stop_filtering = True
filtered_lines.write(line + '\n')
return filtered_lines.getvalue()
......
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