From 1d04ec89b75edd29245fd3d3a543848eef53a732 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Tue, 27 Mar 2012 13:58:49 -0400 Subject: [PATCH] fix up latest so it behaves like latest should if installed and updated available: apply update if not installed and available: install --- library/yum | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/library/yum b/library/yum index a3b95d14ac8..cf9a697edd1 100755 --- a/library/yum +++ b/library/yum @@ -214,13 +214,17 @@ def ensure(my, state, pkgspec): return res if state == 'latest': - if not [ pkg_to_dict(po) for - po in my.doPackageLists(pkgnarrow='updates', patterns=[pkgspec]).updates ]: + updates = my.doPackageLists(pkgnarrow='updates', patterns=[pkgspec]).updates + avail = my.doPackageLists(pkgnarrow='available', patterns=[pkgspec]).available + if not updates and not avail: # there nothing in updates matching this. return { 'changed':False,} - # we have something in updates - cmd = "yum -c %s -d1 -y update '%s'" % (yumconf, pkgspec) + # we have something in updates or available + if not updates: + cmd = "yum -c %s -d1 -y install '%s'" % (yumconf, pkgspec) + else: + cmd = "yum -c %s -d1 -y update '%s'" % (yumconf, pkgspec) rc, out, err = run_yum(cmd) # FIXME if it is - update it and check to see if it applied # check to see if there is no longer an update available for the pkgspec