cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Michael DeHaan 2014-08-04 10:22:29 -04:00
commit 24f6f656cc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/utils/__init__.py
View file

@ -1041,11 +1041,11 @@ def filter_leading_non_json_lines(buf):
filter only leading lines since multiline JSON is valid. 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() filtered_lines = StringIO.StringIO()
stop_filtering = False stop_filtering = False
for line in buf.splitlines(): 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 stop_filtering = True
filtered_lines.write(line + '\n') filtered_lines.write(line + '\n')
return filtered_lines.getvalue() return filtered_lines.getvalue()