cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix to getchanged correctly for yum groupinstall.

Browse source
This commit is contained in:
Hiroaki Nakamura 2013-09-11 02:10:53 +09:00
parent 5a86b82cec
commit 80d68320f7
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packaging/yum
View file

@ -109,6 +109,12 @@ if not os.path.exists(repoquery):
yumbin='/usr/bin/yum' yumbin='/usr/bin/yum'
import syslog
def log(msg):
syslog.openlog('ansible-yum', 0, syslog.LOG_USER)
syslog.syslog(syslog.LOG_NOTICE, msg)
def yum_base(conf_file=None, cachedir=False): def yum_base(conf_file=None, cachedir=False):
my = yum.YumBase() my = yum.YumBase()
@ -464,9 +470,11 @@ def install(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos):
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
if rc != 0 and 'Nothing to do' in err: if (rc != 0 and 'Nothing to do' in err) or 'Nothing to do' in out:
# avoid failing in the 'Nothing To Do' case # avoid failing in the 'Nothing To Do' case
# this may happen with an URL spec # this may happen with an URL spec.
# for an already installed group,
# we get rc = 0 and 'Nothing to do' in out, not in err.
rc = 0 rc = 0
err = '' err = ''
out = '%s: Nothing to do' % spec out = '%s: Nothing to do' % spec
@ -616,7 +624,8 @@ def ensure(module, state, pkgspec, conf_file, enablerepo, disablerepo,
# take multiple args comma separated # take multiple args comma separated
items = pkgspec.split(',') items = pkgspec.split(',')
yum_basecmd = [yumbin, '-d', '1', '-y'] # need debug level 2 to get 'Nothing to do' for groupinstall.
yum_basecmd = [yumbin, '-d', '2', '-y']
if not repoquery: if not repoquery: