Skip to content

A
ansible
Commit 2999b6b2 by Michael DeHaan
Options

Merge pull request #223 from jkleint/devel 

runner._chain_file_module() calls .get() on error string
parents 90a88934 b50c5074
Showing with 5 additions and 2 deletions
lib/ansible/runner.py
...@@ -456,8 +456,11 @@ class Runner(object): ...@@ -456,8 +456,11 @@ class Runner(object):
(result2, err2, executed2) = self._execute_module(conn, tmp, module, args) (result2, err2, executed2) = self._execute_module(conn, tmp, module, args)
results2 = self._return_from_module(conn, conn.host, result2, err2, executed) results2 = self._return_from_module(conn, conn.host, result2, err2, executed)
(host, ok, data2, err2) = results2 (host, ok, data2, err2) = results2
new_changed = data2.get('changed', False) if ok:
data.update(data2) new_changed = data2.get('changed', False)
data.update(data2)
else:
new_changed = False
if old_changed or new_changed: if old_changed or new_changed:
data['changed'] = True data['changed'] = True
return (host, ok, data, "%s%s"%(err,err2)) return (host, ok, data, "%s%s"%(err,err2))
......
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