Skip to content

Commit 7dd51b8

Browse files
author
Andrew
committed
Fixed bad merge
1 parent 70a1d54 commit 7dd51b8

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

powershell-adapter/psDscAdapter/psDscAdapter.psm1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ function Invoke-DscCacheRefresh {
251251
} else {
252252
$dscResourceCacheEntries = $cache.ResourceCache
253253

254-
255254
if ($dscResourceCacheEntries.Count -eq 0) {
256255
# if there is nothing in the cache file - refresh cache
257256
$refreshCache = $true

powershell-adapter/psDscAdapter/win_psDscAdapter.psm1

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,32 +80,13 @@ function Invoke-DscCacheRefresh {
8080
# if there is nothing in the cache file - refresh cache
8181
$refreshCache = $true
8282
"Filtered DscResourceCache cache is empty" | Write-DscTrace
83-
}
84-
else
85-
{
86-
"Checking cache for stale entries" | Write-DscTrace
87-
88-
foreach ($cacheEntry in $dscResourceCacheEntries) {
89-
#"Checking cache entry '$($cacheEntry.Type) $($cacheEntry.LastWriteTimes)'" | Write-DscTrace -Operation Trace
90-
91-
$cacheEntry.LastWriteTimes.PSObject.Properties | ForEach-Object {
92-
93-
if (-not ((Get-Item $_.Name).LastWriteTime.Equals([DateTime]$_.Value)))
94-
{
95-
"Detected stale cache entry '$($_.Name)'" | Write-DscTrace
96-
$refreshCache = $true
97-
break
98-
}
99-
}
100-
101-
"Filtered DscResourceCache cache is empty" | Write-DscTrace
10283
}
10384
else
10485
{
10586
"Checking cache for stale entries" | Write-DscTrace
10687

10788
foreach ($cacheEntry in $dscResourceCacheEntries) {
108-
"Checking cache entry '$($cacheEntry.Type) $($cacheEntry.LastWriteTimes)'" | Write-DscTrace -Operation Trace
89+
#"Checking cache entry '$($cacheEntry.Type) $($cacheEntry.LastWriteTimes)'" | Write-DscTrace -Operation Trace
10990

11091
$cacheEntry.LastWriteTimes.PSObject.Properties | ForEach-Object {
11192

0 commit comments

Comments
 (0)