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

Remove deprecated install and uninstall funcs from chocolatey state

Browse Source 
Use "installed" and "uninstalled" instead, respectively.
This commit is contained in:
rallytime 2016-12-12 15:24:27 -07:00
parent a9f90b881a
commit 78fe43124e
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/topics/releases/nitrogen.rst
View File

@ -97,7 +97,6 @@ Configuration Option Deprecations
- The ``win_repo_mastercachefile`` configuration option has been removed.
Please use the ``winrepo_cachefile`` option instead.
Module Deprecations
-------------------
@ -129,3 +128,11 @@ Salt-SSH Deprecations
- The ``wipe_ssh`` option for ``salt-ssh`` has been removed. Please use the
``ssh_wipe`` option instead.
State Deprecations
------------------
- The ``chocolatey`` state had the following functions removed:
- ``install``: Please use ``installed`` instead.
- ``uninstall``: Please use ``uninstalled`` instead.

24
salt/states/chocolatey.py
View File

@ -19,18 +19,6 @@ def __virtual__():
return 'chocolatey' if 'chocolatey.install' in __salt__ else False
def install(*args, **kwargs):
'''
Deprecated, please use 'installed'. This function will be removed in Salt
Nitrogen.
'''
salt.utils.warn_until('Nitrogen',
'Please use chocolatey.installed. '
'chocolatey.install will be removed in '
'Salt Nitrogen.')
installed(*args, **kwargs)
def installed(name, version=None, source=None, force=False, pre_versions=False,
install_args=None, override_args=False, force_x86=False,
package_args=None):
@ -129,18 +117,6 @@ def installed(name, version=None, source=None, force=False, pre_versions=False,
return ret
def uninstall(*args, **kwargs):
'''
Deprecated, please use 'uninstalled'. This function will be removed in Salt
Nitrogen.
'''
salt.utils.warn_until('Nitrogen',
'Please use chocolatey.uninstalled. '
'chocolatey.uninstall will be removed in '
'Salt Nitrogen.')
uninstalled(*args, **kwargs)
def uninstalled(name, version=None, uninstall_args=None, override_args=False):
'''
Uninstalls a package