Merge pull request #936 from ludovicc/devel

Issue #935: filter out __init__ module from the list of callbacks
This commit is contained in:
Michael DeHaan 2012-08-23 11:39:35 -07:00
commit 1f1aa90aad

View file

@ -25,7 +25,7 @@ from ansible.color import stringc
dirname = os.path.dirname(__file__) dirname = os.path.dirname(__file__)
callbacks = utils.import_plugins(os.path.join(dirname, 'callback_plugins')) callbacks = utils.import_plugins(os.path.join(dirname, 'callback_plugins'))
callbacks = [ c.CallbackModule() for c in callbacks.values() ] callbacks = [ c.CallbackModule() for c in callbacks.values() if c.__name__ != '__init__' ]
cowsay = None cowsay = None
if os.path.exists("/usr/bin/cowsay"): if os.path.exists("/usr/bin/cowsay"):