cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ensure each basedir is only added to the search path once

Browse source 
Fixes #1790.
This commit is contained in:
Daniel Hokka Zakrisson 2012-12-20 14:17:12 +01:00
parent 3a36c024da
commit d4c63e3300
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/utils/plugins.py
View file

@ -58,10 +58,15 @@ class PluginLoader(object):
"""Return a list of paths to search for plugins in
The list is searched in order."""
return self._extra_dirs + \
[os.path.join(basedir, self.subdir) for basedir in _basedirs] + \
self.config.split(os.pathsep) + \
self._get_package_path()
ret = []
ret += self._extra_dirs
for basedir in _basedirs:
fullpath = os.path.join(basedir, self.subdir)
if fullpath not in ret:
ret.append(fullpath)
ret += self.config.split(os.pathsep)
ret += self._get_package_path()
return ret
def add_directory(self, directory):
"""Adds an additional directory to the search path"""