Merge pull request #806 from skvidal/devel
fix up yum state=latest with pkg groups
This commit is contained in:
commit
311d7c46ca
1 changed files with 3 additions and 3 deletions
|
@ -276,7 +276,7 @@ def latest(module, items, repoq, yum_basecmd):
|
||||||
|
|
||||||
for spec in items:
|
for spec in items:
|
||||||
pkg = None
|
pkg = None
|
||||||
|
basecmd = 'update'
|
||||||
# groups, again
|
# groups, again
|
||||||
if spec.startswith('@'):
|
if spec.startswith('@'):
|
||||||
pkg = spec
|
pkg = spec
|
||||||
|
@ -349,10 +349,10 @@ def ensure(module, state, pkgspec, conf_file):
|
||||||
items = pkgspec.split(',')
|
items = pkgspec.split(',')
|
||||||
|
|
||||||
yum_basecmd = '%s -d 1 -y ' % yumbin
|
yum_basecmd = '%s -d 1 -y ' % yumbin
|
||||||
repoq = '%s --plugins --quiet -q ' % repoquery
|
repoq = '%s --show-duplicates --plugins --quiet -q ' % repoquery
|
||||||
if conf_file and os.path.exists(conf_file):
|
if conf_file and os.path.exists(conf_file):
|
||||||
yum_basecmd = '%s -c %s -d 1 -y' % (yumbin, conf_file)
|
yum_basecmd = '%s -c %s -d 1 -y' % (yumbin, conf_file)
|
||||||
repoq = '%s -c %s --plugins --quiet -q ' % (repoquery,conf_file)
|
repoq = '%s --show-duplicates -c %s --plugins --quiet -q ' % (repoquery,conf_file)
|
||||||
|
|
||||||
if state in ['installed', 'present']:
|
if state in ['installed', 'present']:
|
||||||
install(module, items, repoq, yum_basecmd)
|
install(module, items, repoq, yum_basecmd)
|
||||||
|
|
Loading…
Reference in a new issue