From cd3b9366fe223039b010631c31c84bd27f28ae29 Mon Sep 17 00:00:00 2001 From: Tobias Wolf Date: Mon, 25 Jan 2016 13:05:02 +0100 Subject: [PATCH] Add custom or 'prepared' diff field to synchronize module This PR depends on pull requeest ansible/ansible#14105 rsync has a custom diff output that cannot easily be expressed as `/usr/bin/diff before after` --- files/synchronize.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/files/synchronize.py b/files/synchronize.py index 113d57fa47a..d49d518dfdd 100644 --- a/files/synchronize.py +++ b/files/synchronize.py @@ -389,8 +389,14 @@ def main(): out_lines=out_clean.split('\n') while '' in out_lines: out_lines.remove('') - return module.exit_json(changed=changed, msg=out_clean, - rc=rc, cmd=cmdstr, stdout_lines=out_lines) + if module._diff: + diff = {'prepared': out_clean} + return module.exit_json(changed=changed, msg=out_clean, + rc=rc, cmd=cmdstr, stdout_lines=out_lines, + diff=diff) + else: + return module.exit_json(changed=changed, msg=out_clean, + rc=rc, cmd=cmdstr, stdout_lines=out_lines) # import module snippets from ansible.module_utils.basic import *