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

Merge pull request #1387 from skvidal/devel

Browse source 
when a pkg is installed, but not from any repo, don't error out
This commit is contained in:
Michael DeHaan 2012-10-19 16:33:35 -07:00
parent cde377bddb 326b160241
commit 51b423b593
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