wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct the handling of state=latest for yum groups. (#4141)

Browse source 
* Correct the handling up state=latest for yum groups.
* Use yum-deprecated when available

Fixes #4119
This commit is contained in:
jctanner 2016-11-08 21:47:59 -05:00 committed by Matt Clay
parent 9baca6ef3d
commit 019acfa9b0
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -832,6 +832,7 @@ def latest(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos):
# some guess work involved with groups. update @<group> will install the group if missing # some guess work involved with groups. update @<group> will install the group if missing
if spec.startswith('@'): if spec.startswith('@'):
pkgs['update'].append(spec) pkgs['update'].append(spec)
will_update.add(spec)
continue continue
# dep/pkgname - find it # dep/pkgname - find it
else: else:
@ -908,14 +909,16 @@ def latest(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos):
if len(pkgs['install']) > 0: # install missing if len(pkgs['install']) > 0: # install missing
cmd = yum_basecmd + ['install'] + pkgs['install'] cmd = yum_basecmd + ['install'] + pkgs['install']
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
res['changed'] = True if not out.strip().lower().endswith("no packages marked for update"):
res['changed'] = True
else: else:
rc, out, err = [0, '', ''] rc, out, err = [0, '', '']
if len(will_update) > 0: # update present if len(will_update) > 0: # update present
cmd = yum_basecmd + ['update'] + pkgs['update'] cmd = yum_basecmd + ['update'] + pkgs['update']
rc2, out2, err2 = module.run_command(cmd) rc2, out2, err2 = module.run_command(cmd)
res['changed'] = True if not out2.strip().lower().endswith("no packages marked for update"):
res['changed'] = True
else: else:
rc2, out2, err2 = [0, '', ''] rc2, out2, err2 = [0, '', '']
@ -936,7 +939,14 @@ def latest(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos):
def ensure(module, state, pkgs, conf_file, enablerepo, disablerepo, def ensure(module, state, pkgs, conf_file, enablerepo, disablerepo,
disable_gpg_check, exclude, repoq): disable_gpg_check, exclude, repoq):
yumbin = module.get_bin_path('yum') # fedora will redirect yum to dnf, which has incompatibilities
# with how this module expects yum to operate. If yum-deprecated
# is available, use that instead to emulate the old behaviors.
if module.get_bin_path('yum-deprecated'):
yumbin = module.get_bin_path('yum-deprecated')
else:
yumbin = module.get_bin_path('yum')
# need debug level 2 to get 'Nothing to do' for groupinstall. # need debug level 2 to get 'Nothing to do' for groupinstall.
yum_basecmd = [yumbin, '-d', '2', '-y'] yum_basecmd = [yumbin, '-d', '2', '-y']