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

freebsdpkg: Add with_origin argument to version()

Browse Source
This commit is contained in:
Erik Johnson 2014-02-05 23:12:09 -06:00
parent dd986d1e27
commit 6aa1bd649c
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/modules/freebsdpkg.py
View File

@ -188,6 +188,13 @@ def version(*names, **kwargs):
installed. If more than one package name is specified, a dict of
name/version pairs is returned.
with_origin : False
Return a nested dictionary containing both the origin name and version
for each specified package.
.. versionadded:: 2014.1.0 (Hydrogen)
CLI Example:
.. code-block:: bash
@ -195,7 +202,18 @@ def version(*names, **kwargs):
salt '*' pkg.version <package name>
salt '*' pkg.version <package1> <package2> <package3> ...
'''
return __salt__['pkg_resource.version'](*names, **kwargs)
with_origin = kwargs.pop('with_origin', False)
ret = __salt__['pkg_resource.version'](*names, **kwargs)
if not salt.utils.is_true(with_origin):
return ret
# Put the return value back into a dict since we're adding a subdict
if len(names) == 1:
ret = {names[0]: ret}
origins = __context__.get('pkg.origin', {})
return dict([
(x, {'origin': origins.get(x, ''), 'version': y})
for x, y in ret.iteritems()
])
def refresh_db():