Commit c9e62d70 by Dag Wieers

Fix for an exception when for whatever reason the inventory script fails

This avoids a traceback that gave no clue as to what was happening.

This is in line with the change from #1535
parent 75d3b774
...@@ -279,12 +279,12 @@ class Inventory(object): ...@@ -279,12 +279,12 @@ class Inventory(object):
vars.update(updated) vars.update(updated)
if self._is_script: if self._is_script:
cmd = subprocess.Popen( cmd = [self.host_list,"--host",hostname]
[self.host_list,"--host",hostname], try:
stdout=subprocess.PIPE, sp = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stderr=subprocess.PIPE except OSError, e:
) raise errors.AnsibleError("problem running %s (%s)" % (' '.join(cmd), e))
(out, err) = cmd.communicate() (out, err) = sp.communicate()
results = utils.parse_json(out) results = utils.parse_json(out)
# FIXME: this is a bit redundant with host.py and should share code # FIXME: this is a bit redundant with host.py and should share code
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment