Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
012e3ae2
Commit
012e3ae2
authored
Jan 19, 2014
by
Jakub Jirutka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #5679: lineinfile ignores newline in line argument
parent
e3e6f028
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletions
+22
-1
library/files/lineinfile
+5
-1
test/TestRunner.py
+17
-0
No files found.
library/files/lineinfile
View file @
012e3ae2
...
...
@@ -348,7 +348,11 @@ def main():
if
ins_bef
is
None
and
ins_aft
is
None
:
ins_aft
=
'EOF'
present
(
module
,
dest
,
params
[
'regexp'
],
params
[
'line'
],
# Replace the newline character with an actual newline. Don't replace
# escaped \\n, hence sub and not str.replace.
line
=
re
.
sub
(
r'\n'
,
os
.
linesep
,
params
[
'line'
])
present
(
module
,
dest
,
params
[
'regexp'
],
line
,
ins_aft
,
ins_bef
,
create
,
backup
,
backrefs
)
else
:
if
params
[
'regexp'
]
is
None
and
params
.
get
(
'line'
,
None
)
is
None
:
...
...
test/TestRunner.py
View file @
012e3ae2
...
...
@@ -512,6 +512,23 @@ class TestRunner(unittest.TestCase):
result
=
self
.
_run
(
*
testcase
)
assert
result
[
'failed'
]
# insert multiline at the end of the file
testline1
=
'#12: The
\\
n character replaced with'
testline2
=
'an actual newline.'
testcase
=
(
'lineinfile'
,
[
"dest=
%
s"
%
sample
,
"regexp='^#12: '"
,
"line='
%
s
\n
%
s'"
%
(
testline1
,
testline2
)
])
result
=
self
.
_run
(
*
testcase
)
assert
result
[
'changed'
]
assert
result
[
'msg'
]
==
'line added'
artifact
=
[
x
.
strip
()
for
x
in
open
(
sample
)]
assert
artifact
[
-
2
]
==
testline1
assert
artifact
[
-
1
]
==
testline2
assert
artifact
.
count
(
testline1
)
==
1
assert
artifact
.
count
(
testline2
)
==
1
# cleanup
os
.
unlink
(
sample
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment