ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 22:30:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

yum: fix name parsing out of envra (#31247)

Browse source
This commit is contained in:
Martin Krizek 2017-10-04 20:48:00 +02:00 • committed by GitHub
commit 115b4fdc9b
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/packaging/os/yum.py
View file

@ -1024,23 +1024,23 @@ def latest(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos, up
module.fail_json(**res) module.fail_json(**res)
nothing_to_do = True nothing_to_do = True
for this in pkglist: for pkg in pkglist:
if spec in pkgs['install'] and is_available(module, repoq, this, conf_file, en_repos=en_repos, dis_repos=dis_repos, installroot=installroot): if spec in pkgs['install'] and is_available(module, repoq, pkg, conf_file, en_repos=en_repos, dis_repos=dis_repos, installroot=installroot):
nothing_to_do = False nothing_to_do = False
break break
# this contains the full NVR and spec could contain wildcards # this contains the full NVR and spec could contain wildcards
# or virtual provides (like "python-*" or "smtp-daemon") while # or virtual provides (like "python-*" or "smtp-daemon") while
# updates contains name only. # updates contains name only.
this_name_only = '-'.join(this.split('-')[:-2]) pkgname, _, _, _, _ = splitFilename(pkg)
if spec in pkgs['update'] and this_name_only in updates: if spec in pkgs['update'] and pkgname in updates:
nothing_to_do = False nothing_to_do = False
will_update.add(spec) will_update.add(spec)
# Massage the updates list # Massage the updates list
if spec != this_name_only: if spec != pkgname:
# For reporting what packages would be updated more # For reporting what packages would be updated more
# succinctly # succinctly
will_update_from_other_package[spec] = this_name_only will_update_from_other_package[spec] = pkgname
break break
if not is_installed(module, repoq, spec, conf_file, en_repos=en_repos, dis_repos=dis_repos, installroot=installroot) and update_only: if not is_installed(module, repoq, spec, conf_file, en_repos=en_repos, dis_repos=dis_repos, installroot=installroot) and update_only: