diff options
| author | Brian Coca <bcoca@ansible.com> | 2016-01-26 10:01:44 -0500 |
|---|---|---|
| committer | Brian Coca <bcoca@ansible.com> | 2016-01-26 10:01:44 -0500 |
| commit | f374bfd0b31393b740b17a36cdd49bf48b3593d2 (patch) | |
| tree | a02526d893369b56abab420d4706781c264b88d8 | |
| parent | c44110bc81f05fcbedf3dfc429dfe7406b13d86a (diff) | |
| parent | 5b293b56d676eea6b143932d5e66321f568eb589 (diff) | |
| download | ansible-f374bfd0b31393b740b17a36cdd49bf48b3593d2.tar.gz | |
Merge pull request #14105 from towolf/expand_get_diff
Handle the key 'custom' in the 'diff' result from modules
| -rw-r--r-- | lib/ansible/plugins/callback/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py index faf04b1180..bb24577d64 100644 --- a/lib/ansible/plugins/callback/__init__.py +++ b/lib/ansible/plugins/callback/__init__.py @@ -131,6 +131,8 @@ class CallbackBase: differ = difflib.unified_diff(to_unicode(diff['before']).splitlines(True), to_unicode(diff['after']).splitlines(True), before_header, after_header, '', '', 10) ret.extend(list(differ)) ret.append('\n') + if 'prepared' in diff: + ret.append(to_unicode(diff['prepared'])) return u"".join(ret) except UnicodeDecodeError: ret.append(">> the files are different, but the diff library cannot compare unicode strings\n\n") |