internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-04 01:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1548 from dagwieers/inventory-host-exception

Browse Source 
Fix for an exception when for whatever reason the inventory script fails
This commit is contained in:
Michael DeHaan
2012-11-07 13:51:12 -08:00
parent 43410c46f9 c9e62d7061
commit 0ed2595bc6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ansible/inventory/__init__.py
View File

@@ -279,12 +279,12 @@ class Inventory(object):
vars.update(updated)
if self._is_script:
cmd = subprocess.Popen(
[self.host_list,"--host",hostname],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE
)
(out, err) = cmd.communicate()
cmd = [self.host_list,"--host",hostname]
try:
sp = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
except OSError, e:
raise errors.AnsibleError("problem running %s (%s)" % (' '.join(cmd), e))
(out, err) = sp.communicate()
results = utils.parse_json(out)
# FIXME: this is a bit redundant with host.py and should share code