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

Merge pull request #3018 from dsedivec/devel

Browse Source 
Plug-ins loaded from top-level plug-in directory
This commit is contained in:
Michael DeHaan
2013-05-24 18:58:00 -07:00
parent fd9bbeb4f3 611d56dc4c
commit 5fdca267ac
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: