Remove unneeded code, document creates param and ensure creates only affects state=present
This commit is contained in:
parent
fed9e9087e
commit
3238268ea3
2 changed files with 7 additions and 10 deletions
|
@ -27,7 +27,8 @@ module: win_msi
|
|||
version_added: "1.7"
|
||||
short_description: Installs and uninstalls Windows MSI files
|
||||
description:
|
||||
- Installs or uninstalls a Windows MSI file that is already located on the target server
|
||||
- Installs or uninstalls a Windows MSI file that is already located on the
|
||||
target server
|
||||
options:
|
||||
path:
|
||||
description:
|
||||
|
@ -40,6 +41,10 @@ options:
|
|||
- present
|
||||
- absent
|
||||
default: present
|
||||
creates:
|
||||
description:
|
||||
- Path to a file created by installing the MSI to prevent from
|
||||
attempting to reinstall the package on every run
|
||||
author: Matt Martz
|
||||
'''
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ If ($params.extra_args.GetType)
|
|||
$extra_args = $params.extra_args;
|
||||
}
|
||||
|
||||
If ($params.creates.GetType)
|
||||
If ($params.creates.GetType -and $params.state.GetType -and $params.state -ne "absent")
|
||||
{
|
||||
If (Test-File $creates)
|
||||
{
|
||||
|
@ -44,8 +44,6 @@ If ($params.creates.GetType)
|
|||
}
|
||||
|
||||
$logfile = [IO.Path]::GetTempFileName();
|
||||
$stdoutfile = [IO.Path]::GetTempFileName();
|
||||
$stderrfile = [IO.Path]::GetTempFileName();
|
||||
if ($params.state.GetType -and $params.state -eq "absent")
|
||||
{
|
||||
msiexec.exe /x $params.path /qb /l $logfile $extra_args;
|
||||
|
@ -59,13 +57,7 @@ Set-Attr $result "changed" $true;
|
|||
|
||||
$logcontents = Get-Content $logfile;
|
||||
Remove-Item $logfile;
|
||||
$stdoutcontents = Get-Content $stdoutfile;
|
||||
Remove-Item $stdoutfile;
|
||||
$stderrcontents = Get-Content $stderrfile;
|
||||
Remove-Item $stderrfile;
|
||||
|
||||
Set-Attr $result "log" $logcontents;
|
||||
Set-Attr $result "stdout" $stdoutcontents;
|
||||
Set-Attr $result "stderr" $stderrcontents;
|
||||
|
||||
Exit-Json $result;
|
||||
|
|
Loading…
Reference in a new issue