Merge branch 'allow_wildcard_yum' of https://github.com/mscherer/ansible into mscherer-allow_wildcard_yum
This commit is contained in:
commit
fb23c53e3d
1 changed files with 7 additions and 2 deletions
|
@ -648,11 +648,16 @@ def ensure(module, state, pkgspec, conf_file, enablerepo, disablerepo,
|
||||||
for r in dis_repos:
|
for r in dis_repos:
|
||||||
my.repos.disableRepo(r)
|
my.repos.disableRepo(r)
|
||||||
|
|
||||||
|
current_repos = my.repos.repos.keys()
|
||||||
for r in en_repos:
|
for r in en_repos:
|
||||||
try:
|
try:
|
||||||
my.repos.enableRepo(r)
|
my.repos.enableRepo(r)
|
||||||
rid = my.repos.getRepo(r)
|
new_repos = my.repos.repos.keys()
|
||||||
|
for i in new_repos:
|
||||||
|
if not i in current_repos:
|
||||||
|
rid = my.repos.getRepo(i)
|
||||||
a = rid.repoXML.repoid
|
a = rid.repoXML.repoid
|
||||||
|
current_repos = new_repos
|
||||||
except yum.Errors.YumBaseError, e:
|
except yum.Errors.YumBaseError, e:
|
||||||
module.fail_json(msg="Error setting/accessing repo %s: %s" % (r, e))
|
module.fail_json(msg="Error setting/accessing repo %s: %s" % (r, e))
|
||||||
except yum.Errors.YumBaseError, e:
|
except yum.Errors.YumBaseError, e:
|
||||||
|
|
Loading…
Reference in a new issue