1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Add extra module path early during playbook parsing.

This should fix issue #3668

Also prevent an extra module path to be added multiple times.
This commit is contained in:
Stoned Elipot 2013-07-28 18:47:26 +02:00
parent ed55ac1a15
commit 841093921b
2 changed files with 5 additions and 1 deletions

View file

@ -132,6 +132,9 @@ class PlayBook(object):
else:
self.inventory = inventory
if self.module_path is not None:
utils.plugins.module_finder.add_directory(self.module_path)
self.basedir = os.path.dirname(playbook) or '.'
utils.plugins.push_basedir(self.basedir)
vars = extra_vars.copy()

View file

@ -132,7 +132,8 @@ class PluginLoader(object):
if directory is not None:
if with_subdir:
directory = os.path.join(directory, self.subdir)
self._extra_dirs.append(directory)
if directory not in self._extra_dirs:
self._extra_dirs.append(directory)
def find_plugin(self, name):
''' Find a plugin named name '''