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

Preserve changed data on file and template ops when the mode operations don't result in a change but the files

Browse source 
were still replaced.
This commit is contained in:
Michael DeHaan 2012-03-18 16:58:00 -04:00
parent 82bd75c1e0
commit 9837a616eb
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/runner.py
View file

@ -434,8 +434,9 @@ class Runner(object):
results2 = self._return_from_module(conn, host, result2) results2 = self._return_from_module(conn, host, result2)
(host, ok, data2) = results2 (host, ok, data2) = results2
new_changed = data2.get('changed', False) new_changed = data2.get('changed', False)
data['changed'] = old_changed or new_changed
data.update(data2) data.update(data2)
if old_changed or new_changed:
data['changed'] = True
return (host, ok, data) return (host, ok, data)
else: else:
# copy failed, return orig result without going through 'file' module # copy failed, return orig result without going through 'file' module
@ -483,8 +484,9 @@ class Runner(object):
results2 = self._return_from_module(conn, host, result2) results2 = self._return_from_module(conn, host, result2)
(host, ok, data2) = results2 (host, ok, data2) = results2
new_changed = data2.get('changed', False) new_changed = data2.get('changed', False)
data['changed'] = old_changed or new_changed
data.update(data2) data.update(data2)
if old_changed or new_changed:
data['changed'] = True
return (host, ok, data) return (host, ok, data)
else: else:
# copy failed, return orig result without going through 'file' module # copy failed, return orig result without going through 'file' module