ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

when a pkg is installed, but not from any repo, don't error out

Browse source 
that it is not installed.

Also when a pkg is both installed and in a repo do not look it up
more than once
This commit is contained in:
Seth Vidal 2012-10-19 16:28:39 -04:00
parent cde377bddb
commit 326b160241
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/yum
View file

@ -212,7 +212,10 @@ def what_provides(module, repoq, req_spec, conf_file, qf=def_qf):
rc2,out2,err2 = run(cmd)
if rc == 0 and rc2 == 0:
out += out2
return set([ p for p in out.split('\n') if p.strip() ])
pkgs = set([ p for p in out.split('\n') if p.strip() ])
if not pkgs:
pkgs = is_installed(module, repoq, req_spec, conf_file, qf=qf)
return pkgs
else:
module.fail_json(msg='Error from repoquery: %s' % err + err2)
@ -350,6 +353,7 @@ def install(module, items, repoq, yum_basecmd, conf_file):
if is_installed(module, repoq, this, conf_file):
found = True
res['results'].append('%s providing %s is already installed' % (this, spec))
break
if found:
continue