Merge branch 'nocows' of git://github.com/jpmens/ansible into devel

Conflicts:
	lib/ansible/callbacks.py
	lib/ansible/constants.py
This commit is contained in:
Michael DeHaan 2013-04-27 11:34:39 -04:00
commit b8fdcff524
3 changed files with 9 additions and 2 deletions

View file

@ -34,6 +34,8 @@ if constants.DEFAULT_LOG_PATH != '':
callback_plugins = [x for x in utils.plugins.callback_loader.all()]
def get_cowsay_info():
if constants.ANSIBLE_NOCOWS is not None:
return (None, None)
cowsay = None
if os.getenv("ANSIBLE_NOCOWS") is not None:
cowsay = None