ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

A few win_dsc bugfixes (#25852)

Browse source
This commit is contained in:
Trond Hindenes 2017-06-20 22:12:53 +01:00 committed by GitHub
parent 74f6b64fb0
commit 911f4d3eb1
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/windows/win_dsc.ps1
View file

@ -92,7 +92,16 @@ if (!$Resource)
#Get the Module that provides the resource. Will be used as #Get the Module that provides the resource. Will be used as
#mandatory argument for Invoke-DscResource #mandatory argument for Invoke-DscResource
$Module = $Resource.ModuleName $Module = $Resource.ModuleName
$result["module_version"] = $Module.Version.ToString()
#grab the module version if we can
try {
if ($Resource.Module.Version)
{
$result["module_version"] = $Resource.Module.Version.ToString()
}
}
catch {}
#Convert params to correct datatype and inject #Convert params to correct datatype and inject
$attrib.Keys | foreach-object { $attrib.Keys | foreach-object {
@ -221,9 +230,13 @@ try
if ($check_mode -eq $False) if ($check_mode -eq $False)
{ {
$SetResult = Invoke-DscResource -Method Set @Config -ModuleName $Module -ErrorVariable SetError -ErrorAction SilentlyContinue -WarningAction SilentlyContinue $SetResult = Invoke-DscResource -Method Set @Config -ModuleName $Module -ErrorVariable SetError -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
if ($SetError -and ($SetResult -eq $null))
{
#If SetError was filled, throw to exit out of the try/catch loop
throw $SetError
}
$result["reboot_required"] = $SetResult.RebootRequired $result["reboot_required"] = $SetResult.RebootRequired
} }
$result["changed"] = $true $result["changed"] = $true
if ($SetError) if ($SetError)
{ {