internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Plug-ins loaded from top-level plug-in directory

Browse Source 
PluginLoader._get_paths, as of 391fb98e, was only finding plug-ins that
were in a subdirectory of one of the basedirs (i.e. in a category
directory).  For example, action_plugins/foo.py would never be loaded,
but action_plugins/bar/foo.py would work.

This makes it so that "uncategorized" plug-ins in the top level of a
directory such as action_plugins will be loaded, though plug-ins in a
"category" subdirectory will still be preferred.  For example,
action_plugins/bar/foo.py would be preferred over action_plugins/foo.py.
This commit is contained in:
Dale Sedivec
2013-05-24 17:05:28 -05:00
parent 1d3782cfc7
commit 611d56dc4c
5 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ansible/utils/plugins.py
View File

@@ -100,11 +100,10 @@ class PluginLoader(object):
files = glob.glob("%s/*" % fullpath)
for file in files:
if os.path.isdir(file) and file not in ret:
ret.append(file)
else:
ret.append(file)
if fullpath not in ret:
ret.append(fullpath)
# look in any configured plugin paths, allow one level deep for subcategories
configured_paths = self.config.split(os.pathsep)
for path in configured_paths: