wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

win_lineinfile - fix malformed returned json (#50066)

Browse source 
(cherry picked from commit efda3eaf1c)
This commit is contained in:
Jordan Borean 2018-12-19 05:39:25 +10:00 committed by Toshio Kuratomi
parent 6a76fe38e6
commit 3244f9592b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/win_lineinfile-output.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- win_lineinfile - Fix issue where a malformed json block was returned causing an error

8
lib/ansible/modules/windows/win_lineinfile.ps1
View file

@ -183,7 +183,7 @@ function Present($path, $regexp, $line, $insertafter, $insertbefore, $create, $b
$result.msg = "line added";
}
ElseIf ($insertafter -eq "EOF" -or $index[1] -eq -1) {
$lines.Add($line);
$lines.Add($line) > $null;
$result.changed = $true;
$result.msg = "line added";
}
@ -265,11 +265,11 @@ function Absent($path, $regexp, $line, $backup, $validate, $encodingobj, $linese
$match_found = $line -ceq $cur_line;
}
If ($match_found) {
$found.Add($cur_line);
$found.Add($cur_line) > $null;
$result.changed = $true;
}
Else {
$left.Add($cur_line);
$left.Add($cur_line) > $null;
}
}
@ -351,7 +351,7 @@ ElseIf (Test-Path -LiteralPath $path) {
$max_preamble_len = $plen;
}
If ($plen -gt 0) {
$sortedlist.Add(-($plen * 1000000 + $encoding.CodePage), $encoding);
$sortedlist.Add(-($plen * 1000000 + $encoding.CodePage), $encoding) > $null;
}
}