diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2012-04-23 21:05:06 -0400 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2012-04-23 21:05:06 -0400 |
| commit | c00699d0ef0f960b670cc07e75245fcecbfed8d2 (patch) | |
| tree | 3799c6bb4f18058528c6bc5a7380f925b164aeff /lib/ansible/callbacks.py | |
| parent | 1c5bcb606e54781d856b62f4721029ca138848eb (diff) | |
| parent | 321ed53e3ac0bdf0ae2e509ed3311c7e04d6354f (diff) | |
| download | ansible-c00699d0ef0f960b670cc07e75245fcecbfed8d2.tar.gz | |
Merge branch 'integration'
Conflicts:
lib/ansible/playbook.py
lib/ansible/runner.py
library/apt
Diffstat (limited to 'lib/ansible/callbacks.py')
| -rw-r--r-- | lib/ansible/callbacks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/callbacks.py b/lib/ansible/callbacks.py index 0b36a62ab3..a3f46fc9d4 100644 --- a/lib/ansible/callbacks.py +++ b/lib/ansible/callbacks.py @@ -151,7 +151,7 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks): print "failed: [%s] => %s => %s\n" % (host, invocation, utils.smjson(results)) def on_ok(self, host, host_result): - invocation = host_result.get('invocation',None) + invocation = host_result.get('invocation','') if invocation.startswith('async_status'): pass elif not invocation or invocation.startswith('setup '): |