saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix breakage in aptpkg and dpkg execution modules

Browse source 
The change in #39418 added a keyword argument before the *args
definition, which doesn't work. We need to use **kwargs after
the *names or *packages references.

This PR updates the affected functions to remove the ``failhard=True``
definitions to use **kwargs instead, cleans **kwargs, retrieves the
"failhard" option, and then errors if additional, unexpected kwargs
are passed in.
This commit is contained in:
rallytime 2017-02-21 10:58:39 -07:00
parent e4c71683d9
commit d34a8fe9dc
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/modules/aptpkg.py
View file

@ -2464,7 +2464,7 @@ def owner(*paths):
return ret
def info_installed(failhard=True, *names):
def info_installed(*names, **kwargs):
'''
Return the information of the named package(s) installed on the system.
@ -2477,6 +2477,8 @@ def info_installed(failhard=True, *names):
Whether to throw an exception if none of the packages are installed.
Defaults to True.
.. versionadded:: 2016.11.3
CLI example:
.. code-block:: bash
@ -2485,6 +2487,11 @@ def info_installed(failhard=True, *names):
salt '*' pkg.info_installed <package1> <package2> <package3> ...
salt '*' pkg.info_installed <package1> failhard=false
'''
kwargs = salt.utils.clean_kwargs(**kwargs)
failhard = kwargs.pop('failhard', True)
if kwargs:
salt.utils.invalid_kwargs(kwargs)
ret = dict()
for pkg_name, pkg_nfo in __salt__['lowpkg.info'](*names, failhard=failhard).items():
t_nfo = dict()

15
salt/modules/dpkg.py
View file

@ -248,7 +248,7 @@ def file_dict(*packages):
return {'errors': errors, 'packages': ret}
def _get_pkg_info(failhard=True, *packages):
def _get_pkg_info(*packages, **kwargs):
'''
Return list of package information. If 'packages' parameter is empty,
then data about all installed packages will be returned.
@ -257,6 +257,10 @@ def _get_pkg_info(failhard=True, *packages):
:param failhard: Throw an exception if no packages found.
:return:
'''
kwargs = salt.utils.clean_kwargs(**kwargs)
failhard = kwargs.pop('failhard', True)
if kwargs:
salt.utils.invalid_kwargs(kwargs)
if __grains__['os'] == 'Ubuntu' and __grains__['osrelease_info'] < (12, 4):
bin_var = '${binary}'
@ -373,7 +377,7 @@ def _get_pkg_ds_avail():
return ret
def info(failhard=True, *packages):
def info(*packages, **kwargs):
'''
Returns a detailed summary of package information for provided package names.
If no packages are specified, all packages will be returned.
@ -387,6 +391,8 @@ def info(failhard=True, *packages):
Whether to throw an exception if none of the packages are installed.
Defaults to True.
.. versionadded:: 2016.11.3
CLI example:
.. code-block:: bash
@ -399,6 +405,11 @@ def info(failhard=True, *packages):
# However, this file is operated by dselect which has to be installed.
dselect_pkg_avail = _get_pkg_ds_avail()
kwargs = salt.utils.clean_kwargs(**kwargs)
failhard = kwargs.pop('failhard', True)
if kwargs:
salt.utils.invalid_kwargs(kwargs)
ret = dict()
for pkg in _get_pkg_info(*packages, failhard=failhard):
# Merge extra information from the dselect, if available