valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #44500 from abhipallav/add-chocolatey-timeout

Browse Source 
Add support for Chocolatey execution timeout
This commit is contained in:
Nicole Thomas 2017-11-16 15:54:24 -05:00 committed by GitHub
commit 7c0398a8bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/chocolatey.py
View File

@ -369,7 +369,8 @@ def install(name,
force_x86=False,
package_args=None,
allow_multiple=False,
no_progress=False):
no_progress=False,
execution_timeout=None):
'''
Instructs Chocolatey to install a package.
@ -428,6 +429,11 @@ def install(name,
no_progress
Do not show download progress percentages. Defaults to False.
execution_timeout (str):
Chocolatey execution timeout value you want to pass to the installation process. Default is None.
.. versionadded:: Oxygen
Returns:
str: The output of the ``chocolatey`` command
@ -468,6 +474,8 @@ def install(name,
cmd.append('--allow-multiple')
if no_progress:
cmd.append(_no_progress(__context__))
if execution_timeout:
cmd.extend(['--execution-timeout', execution_timeout])
cmd.extend(_yes(__context__))
result = __salt__['cmd.run_all'](cmd, python_shell=False)