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

yumpkg.check_db: run separate repoquery commands when multiple names passed

Browse source
This commit is contained in:
Erik Johnson 2016-01-24 00:49:12 -06:00
parent 8e56be7f4c
commit 410da789f9
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/yumpkg.py
View file

@ -880,7 +880,7 @@ def check_db(*names, **kwargs):
salt '*' pkg.check_db <package1> <package2> <package3> fromrepo=epel-testing
salt '*' pkg.check_db <package1> <package2> <package3> disableexcludes=main
'''
normalize = kwargs.pop('normalize') if kwargs.get('normalize') else False
normalize = kwargs.pop('normalize', True)
repo_arg = _get_repo_options(repoquery=True, **kwargs)
exclude_arg = _get_excludes_option(repoquery=True, **kwargs)
@ -911,14 +911,13 @@ def check_db(*names, **kwargs):
__context__['pkg._avail'] = avail
ret = {}
if names:
repoquery_cmd = repoquery_base + ' {0}'.format(" ".join(names))
provides = sorted(
set(x.name for x in _repoquery_pkginfo(repoquery_cmd))
)
for name in names:
ret.setdefault(name, {})['found'] = name in avail
if not ret[name]['found']:
repoquery_cmd = '{0} {1}'.format(repoquery_base, name)
provides = sorted(
set(x.name for x in _repoquery_pkginfo(repoquery_cmd))
)
if name in provides:
# Package was not in avail but was found by the repoquery_cmd
ret[name]['found'] = True