ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-26 22:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #1477 from skvidal/devel

Browse source 
add check that vars plugins are not handing back None
This commit is contained in:
Michael DeHaan 2012-10-29 16:02:26 -07:00
commit 9a12873166
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/ansible/inventory/__init__.py
View file

@ -282,6 +282,7 @@ class Inventory(object):
vars = {} vars = {}
for ip in self._vars_plugins: for ip in self._vars_plugins:
updated = ip.run(host) updated = ip.run(host)
if updated is not None:
vars.update(updated) vars.update(updated)
if self._is_script: if self._is_script:

6
library/yum
View file

@ -440,12 +440,8 @@ def remove(module, items, repoq, yum_basecmd, conf_file, en_repos, dis_repos):
else: else:
pkglist = is_installed(module, repoq, spec, conf_file, en_repos=en_repos, dis_repos=dis_repos) pkglist = is_installed(module, repoq, spec, conf_file, en_repos=en_repos, dis_repos=dis_repos)
if not pkglist: if not pkglist:
res['msg'] += "No Package matching '%s' found installed" % spec
module.exit_json(**res)
found = False found = False
for this in pkglist: else:
if is_installed(module, repoq, this, conf_file, en_repos=en_repos, dis_repos=dis_repos):
found = True found = True
if not found: if not found: