add show-duplicates to reqpoquery to keep people who

want to install an old package happy.
This commit is contained in:
Seth Vidal 2012-08-08 14:02:38 -04:00
parent ca63173bf0
commit 61e02d508c

View file

@ -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)