Merge pull request #2083 from cchurch/win_lineinfile_fixes

Fix win_lineinfile to pass integration tests
This commit is contained in:
Chris Church 2015-10-14 10:19:10 -04:00
commit 84b1a1a2b7

View file

@ -387,8 +387,11 @@ Elseif (Test-Path $dest) {
$found = $FALSE;
Foreach ($encoding in $sortedlist.GetValueList()) {
$preamble = $encoding.GetPreamble();
If ($preamble) {
Foreach ($i in 0..$preamble.Length) {
If ($preamble -and $bom) {
Foreach ($i in 0..($preamble.Length - 1)) {
If ($i -ge $bom.Length) {
break;
}
If ($preamble[$i] -ne $bom[$i]) {
break;
}
@ -427,7 +430,7 @@ If ($state -eq "present") {
}
Else {
If ($regex -eq $FALSE -and $line -eq $FALSE) {
If ($regexp -eq $FALSE -and $line -eq $FALSE) {
Fail-Json (New-Object psobject) "one of line= or regexp= is required with state=absent";
}