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

Merge pull request #10580 from ansible/v2-parse_kv-newline

Browse source 
Possible fix for the first newline and triple newline problems
This commit is contained in:
Toshio Kuratomi 2015-03-31 07:53:06 -07:00
parent f337707ef1 378dc561cb
commit 70ff7f1b98
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
v2/ansible/parsing/splitter.py
View file

@ -211,7 +211,7 @@ def split_args(args):
params.append(token)
appended = True
elif print_depth or block_depth or comment_depth or inside_quotes or was_inside_quotes:
if idx == 0 and not inside_quotes and was_inside_quotes:
if idx == 0 and was_inside_quotes:
params[-1] = "%s%s" % (params[-1], token)
elif len(tokens) > 1:
spacer = ''
@ -251,8 +251,7 @@ def split_args(args):
# one item (meaning we split on newlines), add a newline back here
# to preserve the original structure
if len(items) > 1 and itemidx != len(items) - 1 and not line_continuation:
if not params[-1].endswith('\n'):
params[-1] += '\n'
params[-1] += '\n'
# always clear the line continuation flag
line_continuation = False