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

Merge pull request #32091 from clarkperkins/bugfix/yumpkg-repoquery

Browse source 
Fixed the regression in #410da78
This commit is contained in:
Erik Johnson 2016-03-25 09:53:08 -05:00
commit ad924226ca
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/yumpkg.py
View file

@ -1004,13 +1004,16 @@ def check_db(*names, **kwargs):
__context__['pkg._avail'] = avail
ret = {}
# This repoquery NEEDS to be outside the loop below. It can be slow, and running it multiple
# times inside the loop can degrade performance greatly.
if names:
repoquery_cmd = repoquery_base + list(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 = 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